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

[Caolán McNamara]

 sc/source/filter/excel/xistream.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2f672e801b6656e4399de12290c56ec3d9f9ad36
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 16 10:24:55 2017 +0000

    ofz#4243 Timeout
    
    Change-Id: Ib1d06c966d10cef2016522a63272bf5c1670977f
    Reviewed-on: https://gerrit.libreoffice.org/44808
    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/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx
index 6624599e2867..546b1edd8a6d 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -793,10 +793,10 @@ void XclImpStream::Ignore( std::size_t nBytes )
     while( mbValid && (nBytesLeft > 0) )
     {
         sal_uInt16 nReadSize = GetMaxRawReadSize( nBytesLeft );
-        mrStrm.SeekRel( nReadSize );
+        mbValid = checkSeek(mrStrm, mrStrm.Tell() + nReadSize);
         mnRawRecLeft = mnRawRecLeft - nReadSize;
         nBytesLeft -= nReadSize;
-        if( nBytesLeft > 0 )
+        if (mbValid && nBytesLeft > 0)
             JumpToNextContinue();
         OSL_ENSURE( mbValid, "XclImpStream::Ignore - record overread" );
     }