[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: -fix crash if SPA not found, lo
From: |
gnunet |
Subject: |
[taler-merchant] branch master updated: -fix crash if SPA not found, look in correct path for SPA |
Date: |
Mon, 23 Jan 2023 17:59:16 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new 078f7cd2 -fix crash if SPA not found, look in correct path for SPA
078f7cd2 is described below
commit 078f7cd2c6830178ca92f1f405281a2b83bfab0f
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Jan 23 17:59:14 2023 +0100
-fix crash if SPA not found, look in correct path for SPA
---
src/backend/taler-merchant-httpd_exchanges.c | 21 +++++++++++++++------
src/backend/taler-merchant-httpd_spa.c | 2 +-
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);
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant] branch master updated: -fix crash if SPA not found, look in correct path for SPA,
gnunet <=