[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sd/qa sd/source

[Caolán McNamara]

 sd/qa/unit/data/ppt/pass/hang-5.ppt |binary
 sd/source/filter/ppt/pptin.cxx      |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5015596b795931eeb328666ec2c99dd372bf6c34
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 27 13:35:37 2015 +0100

    avoid hang in certain ppts
    
    Change-Id: Iedba71b72fc815b274ca5e0da0903a558947cb06
    (cherry picked from commit 90dc4e38928fffc3ed5fcbed40109712eb97e203)
    Reviewed-on: https://gerrit.libreoffice.org/18076
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sd/qa/unit/data/ppt/pass/hang-5.ppt b/sd/qa/unit/data/ppt/pass/hang-5.ppt
new file mode 100644
index 0000000..cfaa8f4
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-5.ppt differ
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 57f1c23..b22372a 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2541,7 +2541,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
             DffRecordHeader& rHdClientData = *maShapeRecords.Current();
             while( true )
             {
-                sal_uInt32 nClientDataLen = rHdClientData.GetRecEndFilePos();
+                sal_uInt32 nClientDataLen = SanitizeEndPos(rSt, rHdClientData.GetRecEndFilePos());
                 DffRecordHeader aHd;
                 do
                 {