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

Caolán McNamara caolanm at redhat.com
Tue Sep 26 09:41:25 UTC 2017


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

New commits:
commit fa85dbb6519b3d9ae096cad7608779476cb3a742
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 26 10:40:11 2017 +0100

    ofz#3483 Floating-point-exception
    
    Change-Id: I3c8dc5e4ec9ce342d2da39459c49eeb0459f76d8

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 7298da030cc6..1521432eca84 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1390,9 +1390,12 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
                         bStatus = false;
                     sal_Int32 ny = nImageLength - 1;
                     sal_uInt32 nStrip(0);
+                    nDiv = GetRowsPerStrip();
+                    if (bStatus)
+                        bStatus = nDiv != 0;
                     if (bStatus)
                     {
-                        nStrip = ny / GetRowsPerStrip() + np * nStripsPerPlane;
+                        nStrip = ny / nDiv + np * nStripsPerPlane;
                         if (nStrip >= aStripOffsets.size())
                             bStatus = false;
                     }


More information about the Libreoffice-commits mailing list