From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 5 Jul 2021 17:14:37 +0000 (+0200)
Subject: qemu-config: never call the callback after an error, fix leak
X-Git-Tag: v6.1.0-rc1~11^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e72f9524febb78ee5ae2a201245cd7b1fb97ad08;p=thirdparty%2Fqemu.git

qemu-config: never call the callback after an error, fix leak

Ensure that the callback to qemu_config_foreach is never called upon
an error, by moving the invocation before the "out" label.

Cc: armbru@redhat.com
Fixes: 3770141139 ("qemu-config: parse configuration files to a QDict", 2021-06-04)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/util/qemu-config.c b/util/qemu-config.c
index 84ee6dc4ea5..7db810f1e02 100644
--- a/util/qemu-config.c
+++ b/util/qemu-config.c
@@ -417,12 +417,12 @@ static int qemu_config_foreach(FILE *fp, QEMUConfigCB *cb, void *opaque,
         return res;
     }
     res = count;
-out:
     if (qdict) {
         cb(group, qdict, opaque, errp);
-        qobject_unref(qdict);
     }
+out:
     loc_pop(&loc);
+    qobject_unref(qdict);
     return res;
 }