summaryrefslogtreecommitdiff
path: root/src/backend/taler-merchant-httpd.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-03-05 18:17:42 +0100
committerChristian Grothoff <christian@grothoff.org>2017-03-05 18:17:42 +0100
commitb613bac566a695c4e122acfb4613f236bcb0d151 (patch)
treede4cdb529ec854810ba9de051376c1b19617d131 /src/backend/taler-merchant-httpd.c
parent467b2f8663432869af24183b039c0f501d4babcf (diff)
downloadmerchant-b613bac566a695c4e122acfb4613f236bcb0d151.tar.gz
merchant-b613bac566a695c4e122acfb4613f236bcb0d151.tar.bz2
merchant-b613bac566a695c4e122acfb4613f236bcb0d151.zip
fix misc memory leaks
Diffstat (limited to 'src/backend/taler-merchant-httpd.c')
-rw-r--r--src/backend/taler-merchant-httpd.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
index 759719e2..f13b8911 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -254,6 +254,7 @@ hashmap_free (void *cls,
struct MerchantInstance *mi = value;
json_decref (mi->j_wire);
+ GNUNET_free (mi->id);
GNUNET_free (mi->keyfile);
GNUNET_free (mi);
return GNUNET_YES;
@@ -501,11 +502,6 @@ instances_iterator_cb (void *cls,
&mi->pubkey.eddsa_pub);
GNUNET_free (pk);
- /**
- * FIXME: 'token' must NOT be freed, as it is handled by the
- * gnunet_configuration facility. OTOH mi->id does need to be freed,
- * because it is a duplicate.
- */
mi->id = GNUNET_strdup (token + 1);
if (0 == strcmp ("default", mi->id))
iic->default_instance = GNUNET_YES;