oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 6 ++++++ sw/qa/core/data/ooxml/fail/ofz14422-1.docx |binary 2 files changed, 6 insertions(+)
New commits: commit 8b20381b936f643c0d6f7525a2acdbdc20366493 Author: Caolán McNamara <[email protected]> AuthorDate: Wed Apr 24 11:38:53 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Apr 25 16:08:12 2019 +0200 ofz#14422 null deref Change-Id: Icd00e2aaa5932564668cd12ce4ee63aecc34419a Reviewed-on: https://gerrit.libreoffice.org/71226 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> 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) diff --git a/sw/qa/core/data/ooxml/fail/ofz14422-1.docx b/sw/qa/core/data/ooxml/fail/ofz14422-1.docx new file mode 100644 index 000000000000..8284f6afc4b3 Binary files /dev/null and b/sw/qa/core/data/ooxml/fail/ofz14422-1.docx differ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
