OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

monitor: Fix missing err = NULL in client_migrate_info()

Browse Source 
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>
This commit is contained in:
Gonglei 2015-02-12 09:57:20 +08:00 committed by Luiz Capitulino
parent 438e8289d7
commit 606ee8f5ea
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
monitor.c
View File

@ -1095,12 +1095,13 @@ static int client_migrate_info(Monitor *mon, const QDict *qdict,
const char *subject = qdict_get_try_str(qdict, "cert-subject"); const char *subject = qdict_get_try_str(qdict, "cert-subject");
int port = qdict_get_try_int(qdict, "port", -1); int port = qdict_get_try_int(qdict, "port", -1);
int tls_port = qdict_get_try_int(qdict, "tls-port", -1); int tls_port = qdict_get_try_int(qdict, "tls-port", -1);
Error *err; Error *err = NULL;
int ret; int ret;
if (strcmp(protocol, "spice") == 0) { if (strcmp(protocol, "spice") == 0) {
if (!qemu_using_spice(&err)) { if (!qemu_using_spice(&err)) {
qerror_report_err(err); qerror_report_err(err);
error_free(err);
return -1; return -1;
} }