i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch by jscipione: Check valid input value range

Browse Source 
for some MAPM functions, since they will otherwise
just return 0, instead of indicating an error.
Thanks! Fixes ticket #6398.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39889 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2010-12-19 10:34:55 +00:00
parent 1828f3d72c
commit 1e9af0512d
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/shared/ExpressionParser.cpp
+10
View File
@@ -579,9 +579,13 @@ ExpressionParser::_ParseFunction(const Token& token)
return values[0].abs();
} else if (strcasecmp("acos", token.string.String()) == 0) {
_InitArguments(values, 1);
if (values[0] < -1 || values[0] > 1)
throw ParseException("out of domain", token.position);
return values[0].acos();
} else if (strcasecmp("asin", token.string.String()) == 0) {
_InitArguments(values, 1);
if (values[0] < -1 || values[0] > 1)
throw ParseException("out of domain", token.position);
return values[0].asin();
} else if (strcasecmp("atan", token.string.String()) == 0) {
_InitArguments(values, 1);
@@ -606,9 +610,13 @@ ExpressionParser::_ParseFunction(const Token& token)
return values[0].floor();
} else if (strcasecmp("ln", token.string.String()) == 0) {
_InitArguments(values, 1);
if (values[0] <= 0)
throw ParseException("out of domain", token.position);
return values[0].log();
} else if (strcasecmp("log", token.string.String()) == 0) {
_InitArguments(values, 1);
if (values[0] <= 0)
throw ParseException("out of domain", token.position);
return values[0].log10();
} else if (strcasecmp("pow", token.string.String()) == 0) {
_InitArguments(values, 2);
@@ -621,6 +629,8 @@ ExpressionParser::_ParseFunction(const Token& token)
return values[0].sinh();
} else if (strcasecmp("sqrt", token.string.String()) == 0) {
_InitArguments(values, 1);
if (values[0] < 0)
throw ParseException("out of domain", token.position);
return values[0].sqrt();
} else if (strcasecmp("tan", token.string.String()) == 0) {
_InitArguments(values, 1);