research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check for additional invalid string-to-double conversions

Browse source
This commit is contained in:
Ray Speth 2018-01-22 18:42:01 -05:00
parent 3e9b0e0c07
commit 84535483f9
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/base/stringUtils.cpp
View file

@ -147,6 +147,9 @@ doublereal fpValueCheck(const std::string& val)
int istart = 0;
ch = str[0];
if (ch == '+' || ch == '-') {
if (str.size() == 1) {
throw CanteraError("fpValueCheck", "string ends in '{}'", ch);
}
istart = 1;
}
for (size_t i = istart; i < str.size(); i++) {
@ -168,9 +171,16 @@ doublereal fpValueCheck(const std::string& val)
if (numExp > 1) {
throw CanteraError("fpValueCheck",
"string has more than one exp char");
} else if (i == str.size() - 1) {
throw CanteraError("fpValueCheck",
"string ends in '{}'", ch);
}
ch = str[i+1];
if (ch == '+' || ch == '-') {
if (i + 1 == str.size() - 1) {
throw CanteraError("fpValueCheck",
"string ends in '{}'", ch);
}
i++;
}
} else {

18
test/general/string_processing.cpp
View file

@ -81,6 +81,24 @@ TEST(parseCompString, not_a_number)
CanteraError);
}
TEST(parseCompString, not_a_number2)
{
ASSERT_THROW(parseCompString("foo:1.0 bar:1e- baz:1e-4"),
CanteraError);
}
TEST(parseCompString, not_a_number3)
{
ASSERT_THROW(parseCompString("foo:1.0 bar:1.2e baz:1e-4"),
CanteraError);
}
TEST(parseCompString, not_a_number4)
{
ASSERT_THROW(parseCompString("foo:1.0 bar:+ baz:1e-4"),
CanteraError);
}
TEST(parseCompString, missing_value)
{
ASSERT_THROW(parseCompString("foo:1.0 bar: baz:1e-4"),