From cb686975edec9812f3cc8fb208e61bd5afcf0594 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 2 Apr 2021 14:55:15 +0200
Subject: [PATCH] fix leak

---
 src/json/json.c      | 10 ++++++----
 src/json/test_json.c |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/json/json.c b/src/json/json.c
index fd526a1db..d0d44058d 100644
--- a/src/json/json.c
+++ b/src/json/json.c
@@ -110,7 +110,8 @@ forget (const json_t *in)
         json_decref (ret);
         return NULL;
       }
-      if (0 != json_array_append_new (ret, t))
+      if (0 != json_array_append_new (ret,
+                                      t))
       {
         GNUNET_break (0);
         json_decref (ret);
@@ -145,8 +146,7 @@ forget (const json_t *in)
       json_t *t;
       json_t *salt;
 
-      if (0 == strcmp (key,
-                       "_forgettable"))
+      if (fg == value)
         continue; /* skip! */
       if (rx == value)
         continue; /* skip! */
@@ -187,6 +187,7 @@ forget (const json_t *in)
           GNUNET_break (0);
           json_decref (ret);
           json_decref (rx);
+          json_decref (t);
           return NULL;
         }
         if (GNUNET_OK !=
@@ -197,15 +198,16 @@ forget (const json_t *in)
           GNUNET_break (0);
           json_decref (ret);
           json_decref (rx);
+          json_decref (t);
           return NULL;
         }
+        json_decref (t);
         if (NULL == rx)
           rx = json_object ();
         if (NULL == rx)
         {
           GNUNET_break (0);
           json_decref (ret);
-          json_decref (rx);
           return NULL;
         }
         if (0 !=
diff --git a/src/json/test_json.c b/src/json/test_json.c
index 83509f8f4..066ba4e73 100644
--- a/src/json/test_json.c
+++ b/src/json/test_json.c
@@ -87,7 +87,7 @@ path_cb (void *cls,
 
 
 static int
-test_contract ()
+test_contract (void)
 {
   struct GNUNET_HashCode h1;
   struct GNUNET_HashCode h2;