lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Fix broken number parsing in fromJSON

Browse source 
The call to tmp_number.append had its arguments mixed up. Also, JSON
does not allow a trailing "," after array/object members.
This commit is contained in:
Eelco Dolstra 2016-02-15 14:46:23 +01:00
parent eb62e23f14
commit e03d6e0998
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -113,14 +113,13 @@ static void parseJSON(EvalState & state, const char * & s, Value & v)
while (isdigit(*s) || *s == '-' || *s == '.' || *s == 'e' || *s == 'E') { while (isdigit(*s) || *s == '-' || *s == '.' || *s == 'e' || *s == 'E') {
if (*s == '.' || *s == 'e' || *s == 'E') if (*s == '.' || *s == 'e' || *s == 'E')
number_type = tFloat; number_type = tFloat;
tmp_number.append(*s++, 1); tmp_number += *s++;
} }
if (number_type == tFloat) { if (number_type == tFloat)
mkFloat(v, stod(tmp_number)); mkFloat(v, stod(tmp_number));
} else { else
mkInt(v, stoi(tmp_number)); mkInt(v, stoi(tmp_number));
}
} }
else if (strncmp(s, "true", 4) == 0) { else if (strncmp(s, "true", 4) == 0) {

2
tests/lang/eval-okay-fromjson.nix
View file

@ -14,7 +14,7 @@ builtins.fromJSON
"Animated" : false, "Animated" : false,
"IDs": [116, 943, 234, 38793, true ,false,null, -100], "IDs": [116, 943, 234, 38793, true ,false,null, -100],
"Latitude": 37.7668, "Latitude": 37.7668,
"Longitude": -122.3959, "Longitude": -122.3959
} }
} }
'' ''