diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-04-24 11:38:53 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-04-25 16:08:12 +0200 |
| commit | 8b20381b936f643c0d6f7525a2acdbdc20366493 (patch) | |
| tree | 4b1d5ce20be0d2467cad47a36e68795c0e6c6aa3 /oox | |
| parent | 3e898d3ce8f12c6f4b4f3a8202812fe8871e0a7f (diff) | |
ofz#14422 null deref
Change-Id: Icd00e2aaa5932564668cd12ce4ee63aecc34419a
Reviewed-on: https://gerrit.libreoffice.org/71226
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/diagram/diagramlayoutatoms.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index 96e305b46a00..323fafe12045 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -1290,6 +1290,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) |