Commit ae7da1e5 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Michael Roth
Browse files

qga: process_event() simplification and leak fix 



json_parser_parse_err() may return something else than a QDict, in
which case we loose the object. Let's keep track of the original
object to avoid leaks.

When an error occurs, "qdict" contains the response, but we still
check the "execute" key there. Untangle a bit this code, by having a
clear error path.

CC: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent c5840b90

qga/main.c

+27 −27
Original line number Diff line number Diff line
@@ -600,42 +600,42 @@ static void process_command(GAState *s, QDict *req) 
static void process_event(JSONMessageParser *parser, GQueue *tokens)

{

    GAState *s = container_of(parser, GAState, parser);

    QDict *qdict;

    QObject *obj;

    QDict *req, *rsp;

    Error *err = NULL;

    int ret;



    g_assert(s && parser);



    g_debug("process_event: called");

    qdict = qobject_to(QDict, json_parser_parse_err(tokens, NULL, &err));

    if (err || !qdict) {

        qobject_unref(qdict);

        if (!err) {

            g_warning("failed to parse event: unknown error");

            error_setg(&err, QERR_JSON_PARSING);

        } else {

            g_warning("failed to parse event: %s", error_get_pretty(err));

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

    if (err) {

        goto err;

    }

        qdict = qmp_error_response(err);

    req = qobject_to(QDict, obj);

    if (!req) {

        error_setg(&err, QERR_JSON_PARSING);

        goto err;

    }



    /* handle host->guest commands */

    if (qdict_haskey(qdict, "execute")) {

        process_command(s, qdict);

    } else {

        if (!qdict_haskey(qdict, "error")) {

            qobject_unref(qdict);

    if (!qdict_haskey(req, "execute")) {

        g_warning("unrecognized payload format");

        error_setg(&err, QERR_UNSUPPORTED);

            qdict = qmp_error_response(err);

        goto err;

    }

        ret = send_response(s, qdict);



    process_command(s, req);

    qobject_unref(obj);

    return;



err:

    g_warning("failed to parse event: %s", error_get_pretty(err));

    rsp = qmp_error_response(err);

    ret = send_response(s, rsp);

    if (ret < 0) {

        g_warning("error sending error response: %s", strerror(-ret));

    }

    }



    qobject_unref(qdict);

    qobject_unref(rsp);

    qobject_unref(obj);

}



/* false return signals GAChannel to close the current client connection */