mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

approxEqual: check isFinite()

Browse Source 
Necessary as all comparisons involving a Nan evaluate to false and the
assert() in isRepresentableInteger() was hit by crash test documents
where approxEqual() was called with a least one Nan.

Change-Id: I9e8f41c36c0cf14cabf47c3df773c601d32682d6
This commit is contained in:
Eike Rathke
2016-10-13 15:07:47 +02:00
parent 042a7fc229
commit b086fd9923
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sal/rtl/math.cxx
View File

@@ -1095,6 +1095,8 @@ bool SAL_CALL rtl_math_approxEqual(double a, double b) SAL_THROW_EXTERN_C()
if (a == 0.0 || b == 0.0) if (a == 0.0 || b == 0.0)
return false; return false;
const double d = fabs(a - b); const double d = fabs(a - b);
if (!rtl::math::isFinite(d))
return false; // Nan or Inf involved
if (d > ((a = fabs(a)) * e44) || d > ((b = fabs(b)) * e44)) if (d > ((a = fabs(a)) * e44) || d > ((b = fabs(b)) * e44))
return false; return false;
if (isRepresentableInteger(d) && isRepresentableInteger(a) && isRepresentableInteger(b)) if (isRepresentableInteger(d) && isRepresentableInteger(a) && isRepresentableInteger(b))