cid#1546503 Using invalid iterator

and

cid#1546284 Using invalid iterator

Change-Id: I9ff3498b65ce392dbe859566b49e60a31e0779f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160370
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index ae8ccc063cf2..291565871ff2 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -2335,9 +2335,13 @@ void PowerPointExport::WritePlaceholderReferenceShapes(PowerPointShapeExport& rD
                 || mXPagePropSet->getPropertyValue("IsDateTimeFixed") == false)))
     {
         if ((xShape = GetReferencedPlaceholderXShape(DateAndTime, ePageType)))
+        {
+            const auto iter = maPlaceholderShapeToIndexMap.find(xShape);
+            assert(iter != maPlaceholderShapeToIndexMap.end());
             rDML.WritePlaceholderReferenceShape(DateAndTime,
-                                                maPlaceholderShapeToIndexMap.find(xShape)->second,
+                                                iter->second,
                                                 ePageType, mXPagePropSet);
+        }
     }
 }