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

in GetInt...() check !isFinite() instead of isNan()

Browse Source 
... and propagate coded double error instead of setting
errIllegalArgument.

Change-Id: I28456c3b0320181a80fe255e875a0bd78216c279
This commit is contained in:
Eike Rathke
2016-09-19 18:49:03 +02:00
parent 388014fc19
commit aa51bf1e17
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sc/source/core/tool/interpr4.cxx
View File

@@ -2149,9 +2149,9 @@ double ScInterpreter::GetDoubleWithDefault(double nDefault)
sal_Int32 ScInterpreter::GetInt32()
{
double fVal = GetDouble();
if (rtl::math::isNan(fVal))
if (!rtl::math::isFinite(fVal))
{
SetError(errIllegalArgument);
SetError( GetDoubleErrorValue( fVal));
return SAL_MAX_INT32;
}
if (fVal > 0.0)
@@ -2178,9 +2178,9 @@ sal_Int32 ScInterpreter::GetInt32()
sal_Int32 ScInterpreter::GetInt32WithDefault( sal_Int32 nDefault )
{
double fVal = GetDoubleWithDefault( nDefault);
if (rtl::math::isNan(fVal))
if (!rtl::math::isFinite(fVal))
{
SetError(errIllegalArgument);
SetError( GetDoubleErrorValue( fVal));
return SAL_MAX_INT32;
}
if (fVal > 0.0)
@@ -2207,9 +2207,9 @@ sal_Int32 ScInterpreter::GetInt32WithDefault( sal_Int32 nDefault )
sal_Int16 ScInterpreter::GetInt16()
{
double fVal = GetDouble();
if (rtl::math::isNan(fVal))
if (!rtl::math::isFinite(fVal))
{
SetError(errIllegalArgument);
SetError( GetDoubleErrorValue( fVal));
return SAL_MAX_INT16;
}
if (fVal > 0.0)
@@ -2236,7 +2236,12 @@ sal_Int16 ScInterpreter::GetInt16()
sal_uInt32 ScInterpreter::GetUInt32()
{
double fVal = rtl::math::approxFloor( GetDouble());
if (rtl::math::isNan(fVal) || fVal < 0.0 || fVal > SAL_MAX_UINT32)
if (!rtl::math::isFinite(fVal))
{
SetError( GetDoubleErrorValue( fVal));
return SAL_MAX_UINT32;
}
if (fVal < 0.0 || fVal > SAL_MAX_UINT32)
{
SetError( errIllegalArgument);
return SAL_MAX_UINT32;