]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemuMonitorAddObject: Use g_clear_pointer for a free and reset operation
authorPeter Krempa <pkrempa@redhat.com>
Wed, 1 Dec 2021 08:31:30 +0000 (09:31 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 7 Dec 2021 08:00:39 +0000 (09:00 +0100)
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_monitor.c

index d752b299abfe0ad858fc7b1cff6413df49a2c93f..6beb23e9f7f13dd251458c3fad0e5deb8895f214 100644 (file)
@@ -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,