Commit bbf1028a authored by Markus Armbruster's avatar Markus Armbruster
Browse files

monitor: Clean up handle_hmp_command() a bit 



Leave checking qobject_type(req) to qmp_check_input_obj().  Rework
handling of json_parser_parse_err() failing without setting an error.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <1487363905-9480-14-git-send-email-armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent dfad9ec4

monitor.c

+5 −4
Original line number Diff line number Diff line
@@ -3735,10 +3735,11 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens) 
    Error *err = NULL;



    req = json_parser_parse_err(tokens, NULL, &err);

    if (err || !req || qobject_type(req) != QTYPE_QDICT) {

        if (!err) {

    if (!req && !err) {

        /* json_parser_parse_err() sucks: can fail without setting @err */

        error_setg(&err, QERR_JSON_PARSING);

    }

    if (err) {

        goto err_out;

    }