From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 12 Feb 2021 09:56:49 +0000 (+0100)
Subject: virJSONValueObjectAddVArgs: Use autofree for the temporary bitmap
X-Git-Tag: v7.1.0-rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4b26c48cb23b87a7f38feab40670f2c7c029e5c;p=thirdparty%2Flibvirt.git

virJSONValueObjectAddVArgs: Use autofree for the temporary bitmap

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/util/virjson.c b/src/util/virjson.c
index e4d71d3e09..7b52525797 100644
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -305,7 +305,7 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj,
         case 'M':
         case 'm': {
             virBitmapPtr map = va_arg(args, virBitmapPtr);
-            virJSONValuePtr jsonMap;
+            g_autoptr(virJSONValue) jsonMap = NULL;
 
             if (!map) {
                 if (type == 'M')
@@ -321,7 +321,8 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj,
                 return -1;
 
             if ((rc = virJSONValueObjectAppend(obj, key, jsonMap)) < 0)
-                virJSONValueFree(jsonMap);
+                return -1;
+            jsonMap = NULL;
         } break;
 
         default: