84a56f38b2
The callback to consume JSON values takes QObject *json, Error *err. If both are null, the callback is supposed to make up an error by itself. This sucks. qjson.c's consume_json() neglects to do so, which makes qobject_from_json() null instead of failing. I consider that a bug. The culprit is json_message_process_token(): it passes two null pointers when it runs into a lexical error or a limit violation. Fix it to pass a proper Error object then. Update the callbacks: * monitor.c's handle_qmp_command(): the code to make up an error is now dead, drop it. * qga/main.c's process_event(): lumps the "both null" case together with the "not a JSON object" case. The former is now gone. The error message "Invalid JSON syntax" is misleading for the latter. Improve it to "Input must be a JSON object". * qobject/qjson.c's consume_json(): no update; check-qjson demonstrates qobject_from_json() now sets an error on lexical errors, but still doesn't on some other errors. * tests/libqtest.c's qmp_response(): the Error object is now reliable, so use it to improve the error message. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20180823164025.12553-40-armbru@redhat.com> |
||
|---|---|---|
| .. | ||
| installer | ||
| vss-win32 | ||
| channel-posix.c | ||
| channel-win32.c | ||
| channel.h | ||
| commands-posix.c | ||
| commands-win32.c | ||
| commands.c | ||
| guest-agent-command-state.c | ||
| guest-agent-core.h | ||
| main.c | ||
| Makefile.objs | ||
| qapi-schema.json | ||
| service-win32.c | ||
| service-win32.h | ||
| vss-win32.c | ||
| vss-win32.h | ||