summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-12-07 20:52:18 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-12-08 10:22:17 +0100
commit4e539eddb646e8a6a3a4743655255ce432e1653f (patch)
tree1f46274c30108363a58b34bf5e068c0bebbf4026
parent9036bf183236459bbb02e41b89fc18cb215f6842 (diff)
tdf#114304 break rather than return false on dodgy record length
Change-Id: I1bc8c400147beb8688ed3afd7402b3d3f68a4a3a Reviewed-on: https://gerrit.libreoffice.org/46043 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--filter/source/msfilter/msdffimp.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 75ee77299717..9c87dd4fc3f5 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6202,7 +6202,10 @@ bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt,
else
{
if (!checkSeek(rSt, rSt.Tell() + nLength))
- return false;
+ {
+ SAL_WARN("filter.ms", "remaining record longer than available data, ppt or parser is wrong");
+ break;
+ }
nReadSpCont += nLength;
}
}