mirror of
https://github.com/qemu/qemu.git
synced 2025-01-07 22:23:26 +08:00
f9277915ee
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>
51 lines
969 B
C
51 lines
969 B
C
/*
|
|
* JSON lexer
|
|
*
|
|
* Copyright IBM, Corp. 2009
|
|
*
|
|
* Authors:
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
|
|
* See the COPYING.LIB file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#ifndef QEMU_JSON_LEXER_H
|
|
#define QEMU_JSON_LEXER_H
|
|
|
|
|
|
typedef enum json_token_type {
|
|
JSON_MIN = 100,
|
|
JSON_LCURLY = JSON_MIN,
|
|
JSON_RCURLY,
|
|
JSON_LSQUARE,
|
|
JSON_RSQUARE,
|
|
JSON_COLON,
|
|
JSON_COMMA,
|
|
JSON_INTEGER,
|
|
JSON_FLOAT,
|
|
JSON_KEYWORD,
|
|
JSON_STRING,
|
|
JSON_INTERP,
|
|
JSON_SKIP,
|
|
JSON_ERROR,
|
|
JSON_END_OF_INPUT,
|
|
} JSONTokenType;
|
|
|
|
typedef struct JSONLexer {
|
|
int start_state, state;
|
|
GString *token;
|
|
int x, y;
|
|
} JSONLexer;
|
|
|
|
void json_lexer_init(JSONLexer *lexer, bool enable_interpolation);
|
|
|
|
void json_lexer_feed(JSONLexer *lexer, const char *buffer, size_t size);
|
|
|
|
void json_lexer_flush(JSONLexer *lexer);
|
|
|
|
void json_lexer_destroy(JSONLexer *lexer);
|
|
|
|
#endif
|