summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-04-24 11:38:53 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2019-04-26 11:32:49 +0200
commitb7662cffb5e12935ffaa4252c081659165600ada (patch)
tree36946a6cdf8d26132713ab59d2e50dd0b087c0e2 /oox
parentccf73c63d4638278b458e3d27c2a8c572bb0cb13 (diff)
ofz#14422 null deref
Change-Id: Icd00e2aaa5932564668cd12ce4ee63aecc34419a Reviewed-on: https://gerrit.libreoffice.org/71305 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/diagram/diagramlayoutatoms.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 1832183d298a..bc30ec38e219 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -1277,6 +1277,12 @@ bool LayoutNode::setupShape( const ShapePtr& rShape, const dgm::Point* pPresNode
continue;
}
+ if (!aDataNode2->second->mpShape)
+ {
+ //busted, skip it
+ continue;
+ }
+
rShape->setDataNodeType(aDataNode2->second->mnType);
if( rItem.mnDepth == 0 )