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

[Caolán McNamara]

 sw/source/filter/html/svxcss1.cxx |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

New commits:
commit abec3df5d8412231ccad7fefd9dd2b222269ed22
Author: Caolán McNamara <caol...@redhat.com>
Date:   Wed Dec 27 18:54:57 2017 +0000

    ofz#4725 Integer-overflow
    
    Change-Id: I74e065b8ba00dc80559bb64cf1bdefa5f9f5b480

diff --git a/sw/source/filter/html/svxcss1.cxx 
b/sw/source/filter/html/svxcss1.cxx
index 559e4e7cb197..881a059c8854 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -2296,10 +2296,18 @@ static void ParseCSS1_margin( const CSS1Expression 
*pExpr,
             break;
         case CSS1_PIXLENGTH:
             {
-                long nPWidth = 0;
-                nMargin =  (long)pExpr->GetNumber();
-                SvxCSS1Parser::PixelToTwip( nPWidth, nMargin );
-                bSetThis = true;
+                auto fMargin = pExpr->GetNumber();
+                if (fMargin < SAL_MAX_INT32/2 && fMargin > SAL_MIN_INT32/2)
+                {
+                    nMargin =  (long)fMargin;
+                    long nPWidth = 0;
+                    SvxCSS1Parser::PixelToTwip( nPWidth, nMargin );
+                    bSetThis = true;
+                }
+                else
+                {
+                    SAL_WARN("sw.html", "out-of-size pxlength: " << fMargin);
+                }
             }
             break;
         case CSS1_PERCENTAGE:

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits