diff options
| author | Markus Armbruster | 2018-08-23 18:39:50 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2018-08-24 20:26:37 +0200 |
| commit | 574bf16ff1f836a442d8de1853eb248c218a591d (patch) | |
| tree | e2e1db0b4df1b63e6b3aacbfd944b2a01c153733 /qobject | |
| parent | json: Reject invalid UTF-8 sequences (diff) | |
| download | qemu-574bf16ff1f836a442d8de1853eb248c218a591d.tar.gz qemu-574bf16ff1f836a442d8de1853eb248c218a591d.tar.xz qemu-574bf16ff1f836a442d8de1853eb248c218a591d.zip | |
json: Report first rather than last parse error
Quiz time! When a parser reports multiple errors, but the user gets
to see just one, which one is (on average) the least useful one?
Yes, you're right, it's the last one! You're clearly familiar with
compilers.
Which one does QEMU report?
Right again, the last one! You're clearly familiar with QEMU.
Reproducer: feeding
{"abc\xC2ijk": 1}\n
to QMP produces
{"error": {"class": "GenericError", "desc": "JSON parse error, key is not a string in object"}}
Report the first error instead. The reproducer now produces
{"error": {"class": "GenericError", "desc": "JSON parse error, invalid UTF-8 sequence in string"}}
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180823164025.12553-24-armbru@redhat.com>
Diffstat (limited to 'qobject')
| -rw-r--r-- | qobject/json-parser.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qobject/json-parser.c b/qobject/json-parser.c index 0e232ff101..b77931614b 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -54,13 +54,13 @@ static void GCC_FMT_ATTR(3, 4) parse_error(JSONParserContext *ctxt, { va_list ap; char message[1024]; + + if (ctxt->err) { + return; + } va_start(ap, msg); vsnprintf(message, sizeof(message), msg, ap); va_end(ap); - if (ctxt->err) { - error_free(ctxt->err); - ctxt->err = NULL; - } error_setg(&ctxt->err, "JSON parse error, %s", message); } |