diff --git a/sd/qa/unit/data/ppt/fail/hang-15.ppt b/sd/qa/unit/data/ppt/pass/hang-15.ppt
similarity index 100%
rename from sd/qa/unit/data/ppt/fail/hang-15.ppt
rename to sd/qa/unit/data/ppt/pass/hang-15.ppt
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index 621a82f6d9a5..b8777b66d57b 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -684,7 +684,7 @@ void SfxOleDictionaryProperty::ImplLoad( SvStream& rStrm )
     sal_Int32 nNameCount = GetPropType();
     // read property ID/name pairs
     maPropNameMap.clear();
-    for (sal_Int32 nIdx = 0; nIdx < nNameCount && rStrm.good(); ++nIdx)
+    for (sal_Int32 nIdx = 0; nIdx < nNameCount && rStrm.good() && rStrm.remainingSize() >= 4; ++nIdx)
     {
         sal_Int32 nPropId(0);
         rStrm.ReadInt32(nPropId);