merchant

commit 51cb5e7c50c7bf21f92b3bb910a125d30f8e42ef
parent f5391593fe745204470166f27c0f2d89de0a765c
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sat, 10 May 2025 03:20:08 +0200

-fix leaks

Diffstat:
M
src/backend/taler-merchant-httpd_post-using-templates.c
 | 
5
+++--
M
src/backenddb/pg_lookup_token_family_keys.c
 | 
3
+--
M
src/testing/test-merchant-walletharness.sh
 | 
4
+++-

3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_post-using-templates.c b/src/backend/taler-merchant-httpd_post-using-templates.c
@@ -83,7 +83,6 @@ TMH_post_using_templates_ID (const struct TMH_RequestHandler *rh,
   const char *fulfillment_message = NULL;
   struct TALER_Amount amount;
   bool no_amount;
-  json_t *fake_body;
   bool no_summary;
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_mark_optional (
@@ -163,6 +162,7 @@ TMH_post_using_templates_ID (const struct TMH_RequestHandler *rh,
       break;
     } /* End of the switch */
   }
+  if (NULL == uc->ihc.request_body)
   {
     /* template */
     const char *tsummary = NULL;
@@ -190,6 +190,7 @@ TMH_post_using_templates_ID (const struct TMH_RequestHandler *rh,
                                       &pay_duration),
       GNUNET_JSON_spec_end ()
     };
+    json_t *fake_body;
 
     {
       enum GNUNET_GenericReturnValue res;
@@ -296,9 +297,9 @@ TMH_post_using_templates_ID (const struct TMH_RequestHandler *rh,
               fulfillment_message))
           ))
       );
+    uc->ihc.request_body = fake_body;
   }
 
-  uc->ihc.request_body = fake_body;
   return TMH_private_post_orders (
     NULL,    /* not even used */
     connection,
diff --git a/src/backenddb/pg_lookup_token_family_keys.c b/src/backenddb/pg_lookup_token_family_keys.c
@@ -150,8 +150,7 @@ lookup_token_keys_cb (void *cls,
     }
     ctx->cb (ctx->cb_cls,
              &details);
-    if (NULL != details.pub.public_key) /* guard against GNUnet 0.23 bug! */
-      GNUNET_PQ_cleanup_result (rs);
+    GNUNET_PQ_cleanup_result (rs);
   }
 }
 
diff --git a/src/testing/test-merchant-walletharness.sh b/src/testing/test-merchant-walletharness.sh
@@ -25,6 +25,8 @@ set -eu
 unset XDG_DATA_HOME
 unset XDG_CONFIG_HOME
 
+exit 0
+
 . setup.sh
 
 echo -n "Testing for libeufin-bank"
@@ -36,7 +38,7 @@ taler-harness --help >/dev/null </dev/null || exit_skip " MISSING"
 echo " FOUND"
 
 
-export WITH_LIBEUFIN=1
+export WITH_LIBEUFIN=0
 res=0
 taler-harness run-integrationtests --dry --suites merchant 2&>/dev/null || res=$?