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

Caolán McNamara caolanm at redhat.com
Mon Mar 20 16:22:12 UTC 2017


 vcl/source/gdi/svmconverter.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 075889bf851b4e7d742f0f31005ac7c0d8ea81d7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 20 16:21:40 2017 +0000

    reject more invalid mapmodes
    
    Change-Id: I068968028b3ed27dc6220bfd335e322ede74454d

diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index fb88d4d4494b..89e42dd0f94c 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -159,7 +159,7 @@ bool ImplReadMapMode(SvStream& rIStm, MapMode& rMapMode)
     sal_Int32 nXNum(0), nXDenom(0), nYNum(0), nYDenom(0);
     rIStm.ReadInt32(nXNum).ReadInt32(nXDenom).ReadInt32(nYNum).ReadInt32(nYDenom);
 
-    if (!rIStm.good() || nXDenom < 0 || nYDenom < 0 || nXNum < 0 || nYNum < 0)
+    if (!rIStm.good() || nXDenom <= 0 || nYDenom <= 0 || nXNum <= 0 || nYNum <= 0)
     {
         SAL_WARN("vcl.gdi", "Parsing error: invalid mapmode fraction");
         return false;


More information about the Libreoffice-commits mailing list