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

[Caolán McNamara]

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

New commits:
commit baf5038e6e8ee66f67a3d3f76d7ba88587fe0f80
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 1 09:36:11 2018 +0000

    ofz#2977 timeout
    
    Change-Id: I56caa2f0631a0a5938ba050d08b07ec6a0add204
    Reviewed-on: https://gerrit.libreoffice.org/50555
    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/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 5fa3ae7eb796..1e93f39bf88e 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1425,6 +1425,11 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
                 nStripsPerPlane = ( nImageLength - 1 ) / nDiv + 1;
             }
 
+            if (bStatus)
+            {
+                bStatus = nSamplesPerPixel != 0;
+            }
+
             if ( bStatus )
             {
                 sal_uInt64 nRowSize = (static_cast<sal_uInt64>(nImageWidth) * nSamplesPerPixel / nPlanes * nBitsPerSample + 7) >> 3;