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

[Caolán McNamara]

 tools/source/generic/fract.cxx                           |    4 +++-
 vcl/qa/cppunit/graphicfilter/data/svm/fail/mapmode-6.svm |binary
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit abb70f9db4f8a2a818e8ca2d2edcce2ee9704bb1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 21 10:07:55 2017 +0100

    ofz#3454 Floating-point-exception
    
    Change-Id: I2432bff8e1c102b83f0b7aff1303a03539ce0350
    Reviewed-on: https://gerrit.libreoffice.org/42580
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index 799ac4575018..7d89ae812e6f 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -189,7 +189,9 @@ namespace
         bool fail = false;
         fail |= o3tl::checked_multiply(i.numerator() / gcd1, num / gcd2, num);
         fail |= o3tl::checked_multiply(i.denominator() / gcd2, den / gcd1, den);
-        i.assign(num, den);
+
+        if (!fail)
+            i.assign(num, den);
 
         return fail;
     }
diff --git a/vcl/qa/cppunit/graphicfilter/data/svm/fail/mapmode-6.svm b/vcl/qa/cppunit/graphicfilter/data/svm/fail/mapmode-6.svm
index 8e8439315bcd..8d6d94e126a3 100644
Binary files a/vcl/qa/cppunit/graphicfilter/data/svm/fail/mapmode-6.svm and b/vcl/qa/cppunit/graphicfilter/data/svm/fail/mapmode-6.svm differ