diff options
| author | Christian Grothoff <christian@grothoff.org> | 2019-01-10 13:57:32 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2019-01-10 13:57:32 +0100 |
| commit | 828cd528f5861226958a26cbe85e05f16fe2cb31 (patch) | |
| tree | 4f85e0976ba2c74a659326cfa0556147c52db211 /src | |
| parent | 529cf928d2ec118b146169ea33280f5e8d6d38c6 (diff) | |
| download | merchant-828cd528f5861226958a26cbe85e05f16fe2cb31.tar.gz merchant-828cd528f5861226958a26cbe85e05f16fe2cb31.tar.bz2 merchant-828cd528f5861226958a26cbe85e05f16fe2cb31.zip | |
fix double-free bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/merchant.conf | 2 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf index 1ac3a2c5..d13091ff 100644 --- a/src/backend/merchant.conf +++ b/src/backend/merchant.conf @@ -54,7 +54,7 @@ DEFAULT_PAY_DEADLINE = 1 day [merchantdb-postgres] CONFIG = postgres:///talermerchant -[merchant-instance-default] +[instance-default] KEYFILE = ${TALER_DATA_HOME}/merchant/merchant.priv # [account-merchant] diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index 9fbec955..44937fdc 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -675,7 +675,6 @@ wireformat_iterator_cb (void *cls, section, "PLUGIN"); GNUNET_free (payto); - GNUNET_free (instance_option); iic->ret = GNUNET_SYSERR; return; } @@ -687,7 +686,6 @@ wireformat_iterator_cb (void *cls, "Failed to load wire plugin `%s'\n", plugin_name); GNUNET_free (plugin_name); - GNUNET_free (instance_option); GNUNET_free (payto); iic->ret = GNUNET_SYSERR; return; @@ -701,7 +699,6 @@ wireformat_iterator_cb (void *cls, payto, plugin_name); GNUNET_free (plugin_name); - GNUNET_free (instance_option); GNUNET_free (payto); TALER_WIRE_plugin_unload (plugin); iic->ret = GNUNET_SYSERR; @@ -1060,8 +1057,8 @@ TMH_lookup_instance (const char *name) * @param json the JSON to inspect; it is not required to * comply with any particular format. It will only be checked * if the field "instance" is there. - * @return a pointer to a #struct MerchantInstance. This will be - * the 'default' merchant if the frontend did not specif any + * @return a pointer to a `struct MerchantInstance`. This will be + * the 'default' merchant if the frontend did not specify any * "instance" field. The user should not care to free the returned * value, as it is taken from a global array that will be freed * by the general shutdown routine. NULL if the frontend specified |