[Libreoffice-commits] core.git: filter/source

[Caolán McNamara]

 filter/source/msfilter/msdffimp.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4e539eddb646e8a6a3a4743655255ce432e1653f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 7 20:52:18 2017 +0000

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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