FGCOM/jansson
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Print correct error message on premature end of array

Browse Source
This commit is contained in:
Petri Lehtinen 2009-06-21 16:04:43 +03:00
parent ae5ed3ff70
commit dc9b954b62
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/load.c
View File

@ -359,25 +359,27 @@ static json_t *json_parse_array(json_lex *lex, json_error_t *error)
return NULL; return NULL;
json_lex_scan(lex); json_lex_scan(lex);
if(lex->token != ']') { if(lex->token == ']')
while(1) { return array;
json_t *elem = json_parse(lex, error);
if(!elem)
goto error;
if(json_array_append(array, elem)) { while(lex->token) {
json_decref(elem); json_t *elem = json_parse(lex, error);
goto error; if(!elem)
} goto error;
if(json_array_append(array, elem)) {
json_decref(elem); json_decref(elem);
goto error;
if(lex->token != ',')
break;
json_lex_scan(lex);
} }
json_decref(elem);
if(lex->token != ',')
break;
json_lex_scan(lex);
} }
if(lex->token != ']') { if(lex->token != ']') {
json_set_error(error, lex, "']' expected"); json_set_error(error, lex, "']' expected");
goto error; goto error;