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

Caolán McNamara caolanm at redhat.com
Fri Feb 10 09:28:36 UTC 2017


 filter/source/graphicfilter/ipict/ipict.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 805784cb85ba5e6a24b32daa722e135eab25828a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 10 09:26:46 2017 +0000

    ofz#579 wrong variable tested for 0
    
    Change-Id: I721dc9d1c15296b2658421b4c4fe794578f3f1af

diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 8e6a4ea..cf54239 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -1056,7 +1056,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo
             const size_t nMaxRows = nWidth ? nMaxPixels / nWidth : SAL_MAX_UINT16;
             if (nHeight > nMaxRows)
                 return 0xffffffff;
-            const size_t nMaxCols = nMaxPixels ? nMaxPixels / nHeight : SAL_MAX_UINT16;
+            const size_t nMaxCols = nHeight ? nMaxPixels / nHeight : SAL_MAX_UINT16;
             if (nWidth > nMaxCols)
                 return 0xffffffff;
 


More information about the Libreoffice-commits mailing list