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

[Caolán McNamara]

 filter/source/msfilter/svdfppt.cxx  |    4 +++-
 sd/qa/unit/data/ppt/pass/hang-6.ppt |binary
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8ccabcc0c0c70bdcc6632c6758723f591677371d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 27 13:49:00 2015 +0100

    check SeekToEndOfRecord for success
    
    Change-Id: I7413a4e9e491b65122eaadb38ad574161f1aa943
    (cherry picked from commit d417ffb7dd93306be7c89526a75acab53dbd8831)
    Reviewed-on: https://gerrit.libreoffice.org/18090
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index d3bb6b7..29f0b36 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2880,7 +2880,9 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
                                                         insertShapeId( nShapeId, pObj );
                                                 }
                                             }
-                                            aShapeHd.SeekToEndOfRecord( rStCtrl );
+                                            bool bSuccess = aShapeHd.SeekToEndOfRecord(rStCtrl);
+                                            if (!bSuccess)
+                                                break;
                                         }
                                     }
                                 }
diff --git a/sd/qa/unit/data/ppt/pass/hang-6.ppt b/sd/qa/unit/data/ppt/pass/hang-6.ppt
new file mode 100644
index 0000000..f5aa247
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-6.ppt differ