summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-12-07 20:52:18 +0000
committerMichael Stahl <Michael.Stahl@cib.de>2019-08-02 14:08:19 +0200
commitf79019101b9bad57a8e05a3f6cb56c47300856e9 (patch)
tree18645110908d00339b8f72d6f2ed64c5a8aee584 /filter
parentbc0d4921545b926fab0e776c9e4c92b0b8262004 (diff)
tdf#114304 break rather than return false on dodgy record length
Change-Id: I1bc8c400147beb8688ed3afd7402b3d3f68a4a3a Reviewed-on: https://gerrit.libreoffice.org/46044 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit c8b76656c46d0d455393faec8d54f3a12c5ec617)
Diffstat (limited to 'filter')
-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 45022d5e8c58..3a14b9011b5f 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6180,7 +6180,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;
}
}