summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-11-16 10:24:55 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-11-16 17:50:31 +0100
commit2f672e801b6656e4399de12290c56ec3d9f9ad36 (patch)
treebf7ea886d18134d27e612fc5db854bc7af1cbd1b
parent454537e4a285b01807aa553ee9c70acd4806d93c (diff)
ofz#4243 Timeout
Change-Id: Ib1d06c966d10cef2016522a63272bf5c1670977f Reviewed-on: https://gerrit.libreoffice.org/44808 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sc/source/filter/excel/xistream.cxx4
1 files changed, 2 insertions, 2 deletions
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" );
}