monitor: Fix missing err = NULL in client_migrate_info()
authorGonglei <arei.gonglei@huawei.com>
Thu, 12 Feb 2015 01:57:20 +0000 (09:57 +0800)
committerLuiz Capitulino <lcapitulino@redhat.com>
Mon, 23 Feb 2015 15:59:38 +0000 (10:59 -0500)
When SPICE isn't used, we either fail an assertion in error_set(),
or leak an error object.  Broken in commit b25d81b.

Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
monitor.c

index c3cc060b45ab45f43163fce6e2d17c060955c7b6..137d23fcc144651d2144a04815b5ef60c727e822 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -1095,12 +1095,13 @@ static int client_migrate_info(Monitor *mon, const QDict *qdict,
     const char *subject  = qdict_get_try_str(qdict, "cert-subject");
     int port             = qdict_get_try_int(qdict, "port", -1);
     int tls_port         = qdict_get_try_int(qdict, "tls-port", -1);
-    Error *err;
+    Error *err = NULL;
     int ret;
 
     if (strcmp(protocol, "spice") == 0) {
         if (!qemu_using_spice(&err)) {
             qerror_report_err(err);
+            error_free(err);
             return -1;
         }