maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

json-to-value: Throw sensible error message on invalid numbers

Browse source
This commit is contained in:
Ben Gamari 2017-12-14 19:09:45 -05:00
parent 5d5b931fb1
commit f9bcbddef2
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libexpr/json-to-value.cc
View file

@ -106,10 +106,16 @@ static void parseJSON(EvalState & state, const char * & s, Value & v)
tmp_number += *s++; tmp_number += *s++;
} }
if (number_type == tFloat) try {
mkFloat(v, stod(tmp_number)); if (number_type == tFloat)
else mkFloat(v, stod(tmp_number));
mkInt(v, stoi(tmp_number)); else
mkInt(v, stoi(tmp_number));
} catch (std::invalid_argument e) {
throw JSONParseError("invalid JSON number");
} catch (std::out_of_range e) {
throw JSONParseError("out-of-range JSON number");
}
} }
else if (strncmp(s, "true", 4) == 0) { else if (strncmp(s, "true", 4) == 0) {