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

[Caolán McNamara]

 filter/source/graphicfilter/itiff/itiff.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit e3b1c791f19276aa85e739ea7e1b7011d058f560
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 16 13:02:12 2017 +0000

    ofz#2977 Timeout
    
    Change-Id: Ib7c00120b97b0d387048a5d8d9d36954e98ffee7
    Reviewed-on: https://gerrit.libreoffice.org/44825
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 7a57097b2ab3..696c13b6b26b 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1309,7 +1309,11 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
                     if( DataTypeSize() * nDataLen > 4 )
                     {
                         pTIFF->ReadUInt32( nOffset );
-                        pTIFF->Seek(nOrigPos + nOffset);
+                        if (!checkSeek(*pTIFF, nOrigPos + nOffset))
+                        {
+                            bStatus = false;
+                            break;
+                        }
                     }
                     ReadTagData( nTagType, nDataLen );
                     nPos += 12; pTIFF->Seek( nPos );