From 93574ac7768d247ed754ecda322e54e4bd447e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 4 Jan 2021 19:19:41 +0000 Subject: [PATCH] ofz#29251 Abrt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icf21642f61a3095b7f3dcb9392274e727e036956 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108680 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- sd/qa/unit/data/ppt/{fail => pass}/hang-15.ppt | Bin sfx2/source/doc/oleprops.cxx | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sd/qa/unit/data/ppt/{fail => pass}/hang-15.ppt (100%) 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);