mirror/stedolan-jq
1
0
Fork 0
mirror of https://github.com/stedolan/jq.git synced 2024-05-11 05:55:39 +00:00
Code Issues Releases Activity

Fix infinite loop on error in sequence parser

Browse Source
This commit is contained in:
Nicolas Williams
2015-06-17 19:46:15 -05:00
parent 4ef04e5b5c
commit bdc1feb50e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jv_parse.c
View File

@@ -715,7 +715,12 @@ jv jv_parser_next(struct jv_parser* p) {
return jv_invalid(); return jv_invalid();
if (!p->curr_buf) if (!p->curr_buf)
return jv_invalid(); // Need a buffer return jv_invalid(); // Need a buffer
if (p->bom_strip_position == 0xff) return jv_invalid_with_msg(jv_string("Malformed BOM")); if (p->bom_strip_position == 0xff) {
if (!(p->flags & JV_PARSE_SEQ))
return jv_invalid_with_msg(jv_string("Malformed BOM"));
p->st =JV_PARSER_WAITING_FOR_RS;
parser_reset(p);
}
jv value = jv_invalid(); jv value = jv_invalid();
if ((p->flags & JV_PARSE_STREAMING) && stream_check_done(p, &value)) if ((p->flags & JV_PARSE_STREAMING) && stream_check_done(p, &value))
return value; return value;
@@ -751,6 +756,7 @@ jv jv_parser_next(struct jv_parser* p) {
parser_reset(p); parser_reset(p);
if (!(p->flags & JV_PARSE_SEQ)) { if (!(p->flags & JV_PARSE_SEQ)) {
// We're not parsing a JSON text sequence; throw this buffer away. // We're not parsing a JSON text sequence; throw this buffer away.
// XXX We should fail permanently here.
p->curr_buf = 0; p->curr_buf = 0;
p->curr_buf_pos = 0; p->curr_buf_pos = 0;
} // Else ch must be RS; don't clear buf so we can start parsing again after this ch } // Else ch must be RS; don't clear buf so we can start parsing again after this ch