Commit 7411faed authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2018-07-11' into staging 



Monitor patches for 2018-07-11

# gpg: Signature made Wed 11 Jul 2018 20:12:31 BST
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-monitor-2018-07-11:
  monitor: fix double-free of request error

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c447afd5 42eab8db

monitor.c

+1 −0
Original line number Diff line number Diff line
@@ -4186,6 +4186,7 @@ static void monitor_qmp_bh_dispatcher(void *data) 
    } else {

        assert(req_obj->err);

        rsp = qmp_error_response(req_obj->err);

        req_obj->err = NULL;

        monitor_qmp_respond(req_obj->mon, rsp, NULL);

        qobject_unref(rsp);

    }