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

[Caolán McNamara]

 vcl/source/font/fontselect.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 222dc6ef01ae56f9c77d225f96a99a93f841e809
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 3 10:02:29 2018 +0100

    ofz#7244 Integer overflow
    
    Change-Id: Ied769220da5512f9fa81a8ee46f724de33dae543
    Reviewed-on: https://gerrit.libreoffice.org/52294
    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/vcl/source/font/fontselect.cxx b/vcl/source/font/fontselect.cxx
index 927e1106c5b6..8e62cf080808 100644
--- a/vcl/source/font/fontselect.cxx
+++ b/vcl/source/font/fontselect.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <o3tl/safeint.hxx>
 
 #include <PhysicalFontFace.hxx>
 #include <svdata.hxx>
@@ -62,9 +63,9 @@ FontSelectPatternAttributes::FontSelectPatternAttributes( const vcl::Font& rFont
 
     // normalize width and height
     if( mnHeight < 0 )
-        mnHeight = -mnHeight;
+        mnHeight = o3tl::saturating_toggle_sign(mnHeight);
     if( mnWidth < 0 )
-        mnWidth = -mnWidth;
+        mnWidth = o3tl::saturating_toggle_sign(mnWidth);
 }