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

[Caolán McNamara (via logerrit)]

 svx/source/svdraw/svdoashp.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 08b4e947584d3e3629089cdcec50dd566c5c031c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 16 12:53:08 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jul 16 20:33:49 2019 +0200

    cid#705480 Dereference null return value
    
    Change-Id: I0ad30d7a2447edbe9d42f0e69470ca850498b798
    Reviewed-on: https://gerrit.libreoffice.org/75722
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 603bedcf9924..23ab67c9d1ae 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1078,7 +1078,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons
             const OUString sViewBox( "ViewBox" );
             const Any* pViewBox = const_cast<SdrCustomShapeGeometryItem&>(aGeometryItem).GetPropertyValueByName( sViewBox );
             css::awt::Rectangle aViewBox;
-            if ( pViewBox && ( *pViewBox >>= aViewBox ) )
+            if (pViewBox && (*pViewBox >>= aViewBox) && pDefCustomShape)
             {
                 if ( ( aViewBox.Width == pDefCustomShape->nCoordWidth )
                     && ( aViewBox.Height == pDefCustomShape->nCoordHeight ) )