summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2022-03-30 08:53:58 +0100
committerCaolán McNamara <caolanm@redhat.com>2022-03-30 12:19:50 +0200
commit254d0e17dcd9a6bce536057b020292ac0ab2e48e (patch)
tree6267e8367228f6846cfa3dea99f7fba3f7cd5e66
parent7efd22c912262f7bf4e4735dae70db0b31ab3d5b (diff)
ofz#46160 Null-dereference READ
Change-Id: Id33a39a7a65849a4ca98b43a88e60d5a96eaf5de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132297 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--oox/source/ppt/slidepersist.cxx2
-rw-r--r--sd/qa/unit/data/pptx/pass/ofz46160-1.pptxbin0 -> 21771 bytes
2 files changed, 2 insertions, 0 deletions
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index 061dda725551..e90f2365fefc 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -347,6 +347,8 @@ void SlidePersist::createConnectorShapeConnection()
for (sal_Int32 i = 0; i < nConnectorShapeCount; i++)
{
const auto& pIt = maShapeMap.find(maConnectorShapeId[i]);
+ if (pIt == maShapeMap.end())
+ continue;
oox::drawingml::ConnectorShapePropertiesList aConnectorShapeProperties
= pIt->second->getConnectorShapeProperties();
uno::Reference<drawing::XShape> xConnector(pIt->second->getXShape(), uno::UNO_QUERY);
diff --git a/sd/qa/unit/data/pptx/pass/ofz46160-1.pptx b/sd/qa/unit/data/pptx/pass/ofz46160-1.pptx
new file mode 100644
index 000000000000..721d1d87d8f0
--- /dev/null
+++ b/sd/qa/unit/data/pptx/pass/ofz46160-1.pptx
Binary files differ