[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH v2] monitor: Fix missing err = NULL in client_migr
From: |
arei.gonglei |
Subject: |
[Qemu-trivial] [PATCH v2] monitor: Fix missing err = NULL in client_migrate_info() |
Date: |
Thu, 12 Feb 2015 09:57:20 +0800 |
From: Gonglei <address@hidden>
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 <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
---
v2:
- rework patch's title and commit message (Markus)
- add R-by tag
---
monitor.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/monitor.c b/monitor.c
index c3cc060..137d23f 100644
--- 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;
}
--
1.7.12.4
- [Qemu-trivial] [PATCH v2] monitor: Fix missing err = NULL in client_migrate_info(),
arei.gonglei <=