[Libreoffice-commits] core.git: svx/source

[Caolán McNamara]

 svx/source/unodraw/unoshap2.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 9fba813b5395d89475f7927170517866bdf3a2d6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Feb 25 00:02:39 2018 +0000

    forcepoint #8 null deref
    
    Change-Id: I29450ab45eba5cccfbfff4744c853e2e70ce679e
    Reviewed-on: https://gerrit.libreoffice.org/50291
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 79e7c24296b6..21b770c092d1 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1913,9 +1913,14 @@ bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemP
     }
 }
 
-
 void SvxCustomShape::createCustomShapeDefaults( const OUString& rValueType )
 {
+    if (!mpObj.is())
+    {
+        OSL_FAIL("could not create Custom Shape Defaults!");
+        return;
+    }
+
     static_cast<SdrObjCustomShape*>(mpObj.get())->MergeDefaultAttributes( &rValueType );
 }