xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Json: Fix buffer overflow when reading json finishing with { or [

Browse Source 
Fixes #1860
This commit is contained in:
Maxime Coste 2018-02-20 07:41:44 +11:00
parent 9755f7f8f2
commit fec34c3748
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/json_ui.cc
View File

@ -296,7 +296,9 @@ parse_json(const char* pos, const char* end)
if (*pos == '[') if (*pos == '[')
{ {
JsonArray array; JsonArray array;
if (*++pos == ']') if (++pos == end)
throw runtime_error("unable to parse array");
if (*pos == ']')
return Result{std::move(array), pos+1}; return Result{std::move(array), pos+1};
while (true) while (true)
@ -319,8 +321,10 @@ parse_json(const char* pos, const char* end)
} }
if (*pos == '{') if (*pos == '{')
{ {
if (++pos == end)
throw runtime_error("unable to parse object");
JsonObject object; JsonObject object;
if (*++pos == '}') if (*pos == '}')
return Result{std::move(object), pos+1}; return Result{std::move(object), pos+1};
while (true) while (true)