From 8fe985c7673d3ad014e8d2dcf304a60a702ee8b3 Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <stanisci.m@gmail.com>
Date: Wed, 21 Mar 2018 15:20:58 +0100
Subject: address leaks.

---
 src/exchange-lib/testing_api_cmd_withdraw.c |  3 ++-
 src/exchange-lib/testing_api_helpers.c      | 10 ++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/exchange-lib')

diff --git a/src/exchange-lib/testing_api_cmd_withdraw.c b/src/exchange-lib/testing_api_cmd_withdraw.c
index 3584cbde3..5f3808a78 100644
--- a/src/exchange-lib/testing_api_cmd_withdraw.c
+++ b/src/exchange-lib/testing_api_cmd_withdraw.c
@@ -280,7 +280,6 @@ withdraw_traits (void *cls,
     TALER_TESTING_interpreter_fail (ws->is);
     return GNUNET_SYSERR;  
   }
-  ws->exchange_url = MAH_path_to_url (ws->exchange, "/");
 
   struct TALER_TESTING_Trait traits[] = {
     TALER_TESTING_make_trait_coin_priv (0 /* only one coin */,
@@ -391,6 +390,8 @@ TALER_TESTING_cmd_withdraw_denomination
   ws->pk = dk;
   ws->expected_response_code = expected_response_code;
   ws->exchange = exchange;
+  ws->exchange_url = MAH_path_to_url (ws->exchange, "/");
+
   cmd.cls = ws;
   cmd.label = label;
   cmd.run = &withdraw_run;
diff --git a/src/exchange-lib/testing_api_helpers.c b/src/exchange-lib/testing_api_helpers.c
index 43c2353d6..f53903033 100644
--- a/src/exchange-lib/testing_api_helpers.c
+++ b/src/exchange-lib/testing_api_helpers.c
@@ -142,7 +142,7 @@ TALER_TESTING_prepare_exchange (const char *config_filename,
   GNUNET_asprintf (&signed_keys_out,
                    "%s/.local/share/taler/auditors/auditor.out",
                    test_home_dir);
-
+  GNUNET_free (test_home_dir);
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (cfg,
                                              "exchange",
@@ -177,6 +177,9 @@ TALER_TESTING_prepare_exchange (const char *config_filename,
     GNUNET_free (signed_keys_out);
     return GNUNET_NO;
   }
+
+
+  GNUNET_free (signed_keys_out);
   GNUNET_OS_process_wait (proc);
   GNUNET_OS_process_destroy (proc);
 
@@ -194,7 +197,6 @@ TALER_TESTING_prepare_exchange (const char *config_filename,
 		"Failed to run `taler-exchange-dbinit`,"
                 " is your PATH correct?\n");
 
-    GNUNET_free (signed_keys_out);
     return GNUNET_NO;
   }
   if (GNUNET_SYSERR ==
@@ -204,7 +206,6 @@ TALER_TESTING_prepare_exchange (const char *config_filename,
   {
     GNUNET_break (0);
     GNUNET_OS_process_destroy (proc);
-    GNUNET_free (signed_keys_out);
     return GNUNET_SYSERR;
   }
   GNUNET_OS_process_destroy (proc);
@@ -213,7 +214,6 @@ TALER_TESTING_prepare_exchange (const char *config_filename,
   {
     fprintf (stderr,
              "Failed to setup database\n");
-    GNUNET_free (signed_keys_out);
     return GNUNET_NO;
   }
   if ( (type != GNUNET_OS_PROCESS_EXITED) ||
@@ -222,11 +222,9 @@ TALER_TESTING_prepare_exchange (const char *config_filename,
     fprintf (stderr,
              "Unexpected error running"
              " `taler-exchange-dbinit'!\n");
-    GNUNET_free (signed_keys_out);
     return GNUNET_SYSERR;
   }
 
-  GNUNET_free (signed_keys_out);
   return GNUNET_OK;
 }
 
-- 
cgit v1.2.3