| Message ID | 20180719184111.5129-12-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | monitor: various code simplification and fixes | expand |
Marc-André Lureau <marcandre.lureau@redhat.com> writes: > An unterminated string will make parser emit an error (tokens == > NULL). Let's report it. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > qobject/qjson.c | 3 +++ > tests/check-qjson.c | 6 +++--- > 2 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/qobject/qjson.c b/qobject/qjson.c > index 8a9d116150..01218c9ad6 100644 > --- a/qobject/qjson.c > +++ b/qobject/qjson.c > @@ -37,6 +37,9 @@ static void parse_json(JSONMessageParser *parser, GQueue *tokens) > { > JSONParsingState *s = container_of(parser, JSONParsingState, parser); > > + if (!tokens && !s->err) { > + error_setg(&s->err, QERR_JSON_PARSING); > + } > if (s->result || s->err) { > if (s->result) { > qobject_unref(s->result); This doesn't fix the JSON parser, it "fixes" one of its users! Other users remain broken. Reproducer for QMP (already mentioned in my review of the previous patch): $ echo -e '{ "execute": "qmp_capabilities" }\n{ "execute": "query-name" }\n"unterminated' | socat UNIX:test-qmp STDIO {"QMP": {"version": {"qemu": {"micro": 90, "minor": 12, "major": 2}, "package": "v3.0.0-rc1-20-g6a024cd461"}, "capabilities": ["oob"]}} {"return": {}} {"return": {}} Note there's no error reported for the last line. The simplification of the JSON parser I have in mind might make this easy to fix properly. I'll look into it. [...]
diff --git a/qobject/qjson.c b/qobject/qjson.c index 8a9d116150..01218c9ad6 100644 --- a/qobject/qjson.c +++ b/qobject/qjson.c @@ -37,6 +37,9 @@ static void parse_json(JSONMessageParser *parser, GQueue *tokens) { JSONParsingState *s = container_of(parser, JSONParsingState, parser); + if (!tokens && !s->err) { + error_setg(&s->err, QERR_JSON_PARSING); + } if (s->result || s->err) { if (s->result) { qobject_unref(s->result); diff --git a/tests/check-qjson.c b/tests/check-qjson.c index 7d3547e0cc..e602abda11 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -1315,7 +1315,7 @@ static void unterminated_string(void) { Error *err = NULL; QObject *obj = qobject_from_json("\"abc", &err); - g_assert(!err); /* BUG */ + error_free_or_abort(&err); g_assert(obj == NULL); } @@ -1323,7 +1323,7 @@ static void unterminated_sq_string(void) { Error *err = NULL; QObject *obj = qobject_from_json("'abc", &err); - g_assert(!err); /* BUG */ + error_free_or_abort(&err); g_assert(obj == NULL); } @@ -1331,7 +1331,7 @@ static void unterminated_escape(void) { Error *err = NULL; QObject *obj = qobject_from_json("\"abc\\\"", &err); - g_assert(!err); /* BUG */ + error_free_or_abort(&err); g_assert(obj == NULL); }
An unterminated string will make parser emit an error (tokens == NULL). Let's report it. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- qobject/qjson.c | 3 +++ tests/check-qjson.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)