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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Mon Apr 5 10:19:12 UTC 2021


 tools/source/generic/fract.cxx                            |    6 ++++++
 vcl/qa/cppunit/graphicfilter/data/svm/pass/ofz32885-1.svm |binary
 2 files changed, 6 insertions(+)

New commits:
commit b4613a30fed86aa8eed45e1ecee13947a33ea81c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Apr 4 20:34:30 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Apr 5 12:18:31 2021 +0200

    ofz#32885 regard as invalid fractions that will FPE boost::integer::gcd
    
    Change-Id: I59befe0cd21be54d1c94bb28e3d9c01f1483c104
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113574
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index b525d1de9896..a76ce01e1f81 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -64,6 +64,12 @@ Fraction::Fraction( sal_Int64 nNum, sal_Int64 nDen ) : mnNumerator(nNum), mnDeno
         SAL_WARN( "tools.fraction", "'Fraction(" << nNum << ",0)' invalid fraction created" );
         return;
     }
+    if (nDen == -1 && nNum == std::numeric_limits<sal_Int32>::min())
+    {
+        mbValid = false;
+        SAL_WARN("tools.fraction", "'Fraction(" << nNum << "," << nDen << ")' invalid fraction created");
+        return;
+    }
 }
 
 /**
diff --git a/vcl/qa/cppunit/graphicfilter/data/svm/pass/ofz32885-1.svm b/vcl/qa/cppunit/graphicfilter/data/svm/pass/ofz32885-1.svm
new file mode 100644
index 000000000000..b4d5126b95cf
Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/svm/pass/ofz32885-1.svm differ


More information about the Libreoffice-commits mailing list