[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 12/18] qjson: return parsing error if unterminate
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 12/18] qjson: return parsing error if unterminated input |
Date: |
Thu, 19 Jul 2018 20:41:05 +0200 |
Signed-off-by: Marc-André Lureau <address@hidden>
---
qobject/json-streamer.c | 4 +++-
qobject/qjson.c | 5 ++++-
tests/check-qjson.c | 8 ++++----
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/qobject/json-streamer.c b/qobject/json-streamer.c
index c51c2021f9..065c551332 100644
--- a/qobject/json-streamer.c
+++ b/qobject/json-streamer.c
@@ -126,7 +126,9 @@ int json_message_parser_feed(JSONMessageParser *parser,
int json_message_parser_flush(JSONMessageParser *parser)
{
- return json_lexer_flush(&parser->lexer);
+ int ret = json_lexer_flush(&parser->lexer);
+
+ return ret ?: g_queue_get_length(parser->tokens);
}
void json_message_parser_destroy(JSONMessageParser *parser)
diff --git a/qobject/qjson.c b/qobject/qjson.c
index 01218c9ad6..8afdc1e06a 100644
--- a/qobject/qjson.c
+++ b/qobject/qjson.c
@@ -64,7 +64,10 @@ QObject *qobject_from_jsonv(const char *string, va_list *ap,
Error **errp)
json_message_parser_init(&state.parser, parse_json);
json_message_parser_feed(&state.parser, string, strlen(string));
- json_message_parser_flush(&state.parser);
+ if (json_message_parser_flush(&state.parser) != 0 &&
+ !state.err) {
+ error_setg(&state.err, QERR_JSON_PARSING);
+ }
json_message_parser_destroy(&state.parser);
error_propagate(errp, state.err);
diff --git a/tests/check-qjson.c b/tests/check-qjson.c
index e602abda11..d0144ba93c 100644
--- a/tests/check-qjson.c
+++ b/tests/check-qjson.c
@@ -1339,7 +1339,7 @@ static void unterminated_array(void)
{
Error *err = NULL;
QObject *obj = qobject_from_json("[32", &err);
- g_assert(!err); /* BUG */
+ error_free_or_abort(&err);
g_assert(obj == NULL);
}
@@ -1347,7 +1347,7 @@ static void unterminated_array_comma(void)
{
Error *err = NULL;
QObject *obj = qobject_from_json("[32,", &err);
- g_assert(!err); /* BUG */
+ error_free_or_abort(&err);
g_assert(obj == NULL);
}
@@ -1363,7 +1363,7 @@ static void unterminated_dict(void)
{
Error *err = NULL;
QObject *obj = qobject_from_json("{'abc':32", &err);
- g_assert(!err); /* BUG */
+ error_free_or_abort(&err);
g_assert(obj == NULL);
}
@@ -1371,7 +1371,7 @@ static void unterminated_dict_comma(void)
{
Error *err = NULL;
QObject *obj = qobject_from_json("{'abc':32,", &err);
- g_assert(!err); /* BUG */
+ error_free_or_abort(&err);
g_assert(obj == NULL);
}
--
2.18.0.129.ge3331758f1
- [Qemu-devel] [PATCH v2 09/18] json-parser: further simplify freeing JSONParserContext, (continued)
- [Qemu-devel] [PATCH v2 09/18] json-parser: further simplify freeing JSONParserContext, Marc-André Lureau, 2018/07/19
- [Qemu-devel] [PATCH v2 06/18] qga: process_event() simplification and leak fix, Marc-André Lureau, 2018/07/19
- [Qemu-devel] [PATCH v2 07/18] qmp: drop json_parser_parse() wrapper, Marc-André Lureau, 2018/07/19
- [Qemu-devel] [PATCH v2 13/18] json-parser: set an error if parsing returned NULL, Marc-André Lureau, 2018/07/19
- [Qemu-devel] [PATCH v2 15/18] tests: add a few qemu-qmp tests, Marc-André Lureau, 2018/07/19
- [Qemu-devel] [PATCH v2 14/18] json-lexer: make it safe to call multiple times, Marc-André Lureau, 2018/07/19
- [Qemu-devel] [PATCH v2 12/18] qjson: return parsing error if unterminated input,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 18/18] RFC: qmp: common 'id' handling & make QGA conform to QMP spec, Marc-André Lureau, 2018/07/19
- [Qemu-devel] [PATCH v2 16/18] tests: add a qmp success-response test, Marc-André Lureau, 2018/07/19
- [Qemu-devel] [PATCH v2 17/18] qga: process_event() simplification, Marc-André Lureau, 2018/07/19