From 8e9ad03830367062aaa84206eae56252eca2ec5e Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 10 Oct 2011 16:51:55 +0100
Subject: Related: fdo#38580 NULL object

---
 cppcanvas/source/mtfrenderer/emfplus.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cppcanvas/source')

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 88755c506282..fe5a129d2e26 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1533,10 +1533,10 @@ namespace cppcanvas
                 case EmfPlusRecordTypeSetClipRegion: {
                     EMFP_DEBUG (printf ("EMF+ SetClipRegion\n"));
                     EMFP_DEBUG (printf ("EMF+\tregion in slot: %d combine mode: %d\n", flags & 0xff, (flags & 0xff00) >> 8));
-                    EMFPRegion& region = *(EMFPRegion*) aObjects [flags & 0xff];
+                    EMFPRegion *region = (EMFPRegion*)aObjects [flags & 0xff];
 
                     // reset clip
-                    if (region.parts == 0 && region.initialState == EmfPlusRegionInitialStateInfinite) {
+                    if (region && region->parts == 0 && region->initialState == EmfPlusRegionInitialStateInfinite) {
                         updateClipping (::basegfx::B2DPolyPolygon (), rFactoryParms, false);
                     } else {
                         EMFP_DEBUG (printf ("EMF+\tTODO\n"));
-- 
cgit