From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 1 Dec 2021 08:31:30 +0000 (+0100)
Subject: qemuMonitorAddObject: Use g_clear_pointer for a free and reset operation
X-Git-Tag: v8.0.0-rc1~359
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=377c3dd3b1d3f0ac2d5d36a929130a1794721049;p=thirdparty%2Flibvirt.git

qemuMonitorAddObject: Use g_clear_pointer for a free and reset operation

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index d752b299ab..6beb23e9f7 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2956,10 +2956,9 @@ qemuMonitorAddObject(qemuMonitor *mon,
         ignore_value(virJSONValueObjectRemoveKey(*props, "qom-type", &typeobj));
         ignore_value(virJSONValueObjectRemoveKey(*props, "id", &idobj));
 
-        if (!virJSONValueObjectGetKey(*props, 0)) {
-            virJSONValueFree(*props);
-            *props = NULL;
-        }
+        /* avoid empty 'props' member */
+        if (!virJSONValueObjectGetKey(*props, 0))
+            g_clear_pointer(props, virJSONValueFree);
 
         if (virJSONValueObjectAdd(&pr,
                                   "s:qom-type", type,