[Libreoffice-commits] core.git: sd/qa sfx2/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Jan 5 23:16:51 UTC 2021


 sfx2/source/doc/oleprops.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 93574ac7768d247ed754ecda322e54e4bd447e43
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jan 4 19:19:41 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jan 6 00:16:06 2021 +0100

    ofz#29251 Abrt
    
    Change-Id: Icf21642f61a3095b7f3dcb9392274e727e036956
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108680
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

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);


More information about the Libreoffice-commits mailing list