summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-08-07 08:46:19 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-08-07 11:05:33 +0200
commit6d6b574328bbdda9ae22347ad8ebe34e0f1173be (patch)
tree86fb8b9edf64810a5496666240f5984837efed8f /oox
parent0b2e052238e87faf5b76fe89ed1e10b20c5a3eaa (diff)
crashtesting: null deref on import of fdo62183-3.pptx
Change-Id: I5b713584a8d6442e01fbcf98d43ea34073087cc6 Reviewed-on: https://gerrit.libreoffice.org/77080 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/shape.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 050a8884c151..ae5afd443b94 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1489,8 +1489,8 @@ void Shape::keepDiagramCompatibilityInfo()
if (mpDiagramData)
{
- SdrObject* pObj = GetSdrObjectFromXShape(mxShape);
- pObj->SetDiagramData(mpDiagramData);
+ if (SdrObject* pObj = GetSdrObjectFromXShape(mxShape))
+ pObj->SetDiagramData(mpDiagramData);
}
const OUString aGrabBagPropName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;