diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-08-23 18:40:12 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2018-08-24 20:26:37 +0200 |
| commit | f9277915ee7b2654f5347c4c261c8a0651fdd561 (patch) | |
| tree | fdd3e61e5c1e072b9fc24cdb6fac78a4d551d942 /include | |
| parent | e06d008ac833ac220b920f4d8858e6f62f7a59f9 (diff) | |
| download | qemu-f9277915ee7b2654f5347c4c261c8a0651fdd561.zip qemu-f9277915ee7b2654f5347c4c261c8a0651fdd561.tar.gz qemu-f9277915ee7b2654f5347c4c261c8a0651fdd561.tar.bz2 | |
json: Fix streamer not to ignore trailing unterminated structures
json_message_process_token() accumulates tokens until it got the
sequence of tokens that comprise a single JSON value (it counts curly
braces and square brackets to decide). It feeds those token sequences
to json_parser_parse(). If a non-empty sequence of tokens remains at
the end of the parse, it's silently ignored. check-qjson.c cases
unterminated_array(), unterminated_array_comma(), unterminated_dict(),
unterminated_dict_comma() demonstrate this bug.
Fix as follows. Introduce a JSON_END_OF_INPUT token. When the
streamer receives it, it feeds the accumulated tokens to
json_parser_parse().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180823164025.12553-46-armbru@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/qapi/qmp/json-lexer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/qapi/qmp/json-lexer.h b/include/qapi/qmp/json-lexer.h index afa84cb..508fc7b 100644 --- a/include/qapi/qmp/json-lexer.h +++ b/include/qapi/qmp/json-lexer.h @@ -30,6 +30,7 @@ typedef enum json_token_type { JSON_INTERP, JSON_SKIP, JSON_ERROR, + JSON_END_OF_INPUT, } JSONTokenType; typedef struct JSONLexer { |