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

[Caolán McNamara]

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

New commits:
commit 1603f343049843dc1aa94fe0dc076597d2b692a2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 20 15:29:39 2017 +0000

    ofz#918 invalid mapmode
    
    Change-Id: I9512bc482242f03590c92c4286947e3ab824b8a2

diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index a17c0cb63ddf..fb88d4d4494b 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 || nYNum < 0)
+    if (!rIStm.good() || nXDenom < 0 || nYDenom < 0 || nXNum < 0 || nYNum < 0)
     {
         SAL_WARN("vcl.gdi", "Parsing error: invalid mapmode fraction");
         return false;