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

[Caolán McNamara]

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

New commits:
commit cc8814dd2aecdb88b6095ab350c7a43ea694a828
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 27 13:58:48 2015 +0100

    check seek for success
    
    Change-Id: I02420ffb3af009d08ce54a0932e2c7a287703a72
    (cherry picked from commit 1830b4f2e324090962a993315ce76752d24d4088)
    Reviewed-on: https://gerrit.libreoffice.org/18078
    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-7.ppt b/sd/qa/unit/data/ppt/pass/hang-7.ppt
new file mode 100644
index 0000000..8c05271
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-7.ppt differ
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index 722ab44..20e59df 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -414,7 +414,11 @@ void Section::Read( SvStorageStream *pStrm )
                 if ( nPropSize )
                 {
                     if ( ( nVectorCount - i ) > 1 )
-                        pStrm->Seek( nPropOfs + nSecOfs + nPropSize );
+                    {
+                        nOffset = nPropOfs + nSecOfs + nPropSize;
+                        if (nOffset != pStrm->Seek(nOffset))
+                            break;
+                    }
                 }
                 else
                     break;