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

Caolán McNamara caolanm at redhat.com
Sat Oct 21 18:57:23 UTC 2017


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

New commits:
commit 92874c94caa8a46b44c3b4b6499c85ae97e61ae4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Oct 21 18:30:11 2017 +0100

    check that seeks succeeded
    
    Change-Id: I4d27bf8287f9ba2945081537a6c839232df75c42
    Reviewed-on: https://gerrit.libreoffice.org/43668
    Tested-by: Jenkins <ci at libreoffice.org>
    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 cfcc4f641cd9..09c6c9dacc41 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6304,9 +6304,9 @@ bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& rData, tools::Rectangle
         // fetch matching info struct out of the pointer array
         SvxMSDffBLIPInfo& rInfo = (*m_pBLIPInfos)[ nIdx-1 ];
         // jump to the BLIP atom in the data stream
-        pStData->Seek( rInfo.nFilePos );
+        bOk = checkSeek(*pStData, rInfo.nFilePos);
         // possibly reset error status
-        if( pStData->GetError() )
+        if (!bOk || pStData->GetError())
             pStData->ResetError();
         else
             bOk = GetBLIPDirect( *pStData, rData, pVisArea );
@@ -6318,9 +6318,9 @@ bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& rData, tools::Rectangle
                 pStData2->ResetError();
             sal_uLong nOldPosData2 = pStData2->Tell();
             // jump to the BLIP atom in the second data stream
-            pStData2->Seek( rInfo.nFilePos );
+            bOk = checkSeek(*pStData2, rInfo.nFilePos);
             // reset error status if necessary
-            if( pStData2->GetError() )
+            if (!bOk || pStData2->GetError())
                 pStData2->ResetError();
             else
                 bOk = GetBLIPDirect( *pStData2, rData, pVisArea );


More information about the Libreoffice-commits mailing list