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

[Caolán McNamara]

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

New commits:
commit c110c93a283816a69be917d534b8ba321adf2133
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 4 17:12:03 2018 +0100

    ofz#7359 Integer overflow
    
    Change-Id: I9c857f7fb8fbfceb9e061fd0bc1f0b0b63b35524
    Reviewed-on: https://gerrit.libreoffice.org/52401
    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 e1cf68d5669e..bc13659a2631 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -1482,7 +1482,8 @@ namespace emfio
                         else
                         {
                             Bitmap aBitmap;
-                            tools::Rectangle aRect( Point( xDest, yDest ), Size( cxDest, cyDest ) );
+                            tools::Rectangle aRect(xDest, yDest);
+                            aRect.SaturatingSetSize(Size(cxDest, cyDest));
 
                             sal_uInt32 nSize = cbBmiSrc + cbBitsSrc + 14;
                             if ( nSize <= ( mnEndPos - mnStartPos ) )