shared/json: fix another memleak in normalization

(cherry picked from commit 3b6ce05) Related: #2087652
redhat-plumbers · Jun 14, 2022 · 6e0d847 · 6e0d847
1 parent 03795a6
commit 6e0d847
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/shared/json.c b/src/shared/json.c
@@ -4621,7 +4621,7 @@ int json_variant_sort(JsonVariant **v) {
 
 int json_variant_normalize(JsonVariant **v) {
         _cleanup_free_ JsonVariant **a = NULL;
-        JsonVariant *n = NULL;
+        _cleanup_(json_variant_unrefp) JsonVariant *n = NULL;
         size_t i, m;
         int r;
 
@@ -4669,7 +4669,7 @@ int json_variant_normalize(JsonVariant **v) {
                 goto finish;
         }
 
-        JSON_VARIANT_REPLACE(*v, n);
+        JSON_VARIANT_REPLACE(*v, TAKE_PTR(n));
 
         r = 1;
 

diff --git a/test/fuzz/fuzz-json/leak-normalize-object b/test/fuzz/fuzz-json/leak-normalize-object
@@ -0,0 +1 @@
+[7,7,7,7,{"":7,"":7,"^t":7,"-":7},2777,7,7,7,3]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[7,7,7,7,{"":7,"":7,"^t":7,"-":7},2777,7,7,7,3]