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

[Caolán McNamara]

 emfio/source/reader/emfreader.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d4dba27466b0f89226b073277c3ffc48161bd9e8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 31 14:31:31 2017 +0000

    ofz#3951 Integer-overflow
    
    Change-Id: I30a6b7c00cc7895ed4c307fe0bbe685bd29217ed
    Reviewed-on: https://gerrit.libreoffice.org/44121
    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/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
index 4205d8dee225..cfcb6e3feea5 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -1538,8 +1538,10 @@ namespace emfio
                             // const basegfx::B2DVector aTransVec(aWT * basegfx::B2DVector(aLogFont.lfWidth, aLogFont.lfHeight));
                             // aLogFont.lfWidth = aTransVec.getX();
                             // aLogFont.lfHeight = aTransVec.getY();
-                            if (mpInputStream->good())
+                            if (mpInputStream->good() && aLogFont.lfHeight != SAL_MIN_INT32 && aLogFont.lfWidth != SAL_MIN_INT32)
+                            {
                                 CreateObjectIndexed(nIndex, o3tl::make_unique<WinMtfFontStyle>( aLogFont ));
+                            }
                         }
                     }
                     break;