summaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2023-01-23 17:59:14 +0100
committerChristian Grothoff <christian@grothoff.org>2023-01-23 17:59:14 +0100
commit078f7cd2c6830178ca92f1f405281a2b83bfab0f (patch)
treed1dfa94784bd2bf0f51b07ea21f70e24bdd43d57 /src/backend
parent6571d7192f2952ecc62d2dd55c322d2293f6cb2c (diff)
downloadmerchant-078f7cd2c6830178ca92f1f405281a2b83bfab0f.tar.gz
merchant-078f7cd2c6830178ca92f1f405281a2b83bfab0f.tar.bz2
merchant-078f7cd2c6830178ca92f1f405281a2b83bfab0f.zip
-fix crash if SPA not found, look in correct path for SPA
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/taler-merchant-httpd_exchanges.c21
-rw-r--r--src/backend/taler-merchant-httpd_spa.c2
2 files changed, 16 insertions, 7 deletions
diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c
index 12c75ca4..f0324c47 100644
--- a/src/backend/taler-merchant-httpd_exchanges.c
+++ b/src/backend/taler-merchant-httpd_exchanges.c
@@ -1371,12 +1371,21 @@ TMH_EXCHANGES_done ()
{
while (NULL != exchange_head)
free_exchange_entry (exchange_head);
- GNUNET_CURL_fini (merchant_curl_ctx);
- merchant_curl_ctx = NULL;
- GNUNET_CURL_gnunet_rc_destroy (merchant_curl_rc);
- merchant_curl_rc = NULL;
- json_decref (TMH_trusted_exchanges);
- TMH_trusted_exchanges = NULL;
+ if (NULL != merchant_curl_ctx)
+ {
+ GNUNET_CURL_fini (merchant_curl_ctx);
+ merchant_curl_ctx = NULL;
+ }
+ if (NULL != merchant_curl_rc)
+ {
+ GNUNET_CURL_gnunet_rc_destroy (merchant_curl_rc);
+ merchant_curl_rc = NULL;
+ }
+ if (NULL != TMH_trusted_exchanges)
+ {
+ json_decref (TMH_trusted_exchanges);
+ TMH_trusted_exchanges = NULL;
+ }
}
diff --git a/src/backend/taler-merchant-httpd_spa.c b/src/backend/taler-merchant-httpd_spa.c
index 657b0e16..248b8729 100644
--- a/src/backend/taler-merchant-httpd_spa.c
+++ b/src/backend/taler-merchant-httpd_spa.c
@@ -309,7 +309,7 @@ TMH_spa_init ()
return GNUNET_SYSERR;
}
GNUNET_asprintf (&dn,
- "%s/merchant-backoffice/",
+ "%smerchant/spa/",
path);
GNUNET_free (path);
}