[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] branch master updated: work on #5092, hand
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant] branch master updated: work on #5092, handle failure in easy case without asserting |
Date: |
Sat, 09 Sep 2017 22:28:00 +0200 |
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 cd3071d work on #5092, handle failure in easy case without asserting
cd3071d is described below
commit cd3071d864eda94562851796f5559e3e90c2d62f
Author: Christian Grothoff <address@hidden>
AuthorDate: Sat Sep 9 22:27:53 2017 +0200
work on #5092, handle failure in easy case without asserting
---
src/backend/taler-merchant-httpd_responses.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_responses.c
b/src/backend/taler-merchant-httpd_responses.c
index 1ea2600..f5f994e 100644
--- a/src/backend/taler-merchant-httpd_responses.c
+++ b/src/backend/taler-merchant-httpd_responses.c
@@ -44,7 +44,11 @@ TMH_RESPONSE_make_json (const json_t *json)
json_str = json_dumps (json,
JSON_INDENT(2));
- GNUNET_assert (NULL != json_str);
+ if (NULL == json_str)
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
resp = MHD_create_response_from_buffer (strlen (json_str),
json_str,
MHD_RESPMEM_MUST_FREE);
@@ -268,7 +272,7 @@ TMH_RESPONSE_reply_not_found (struct MHD_Connection
*connection,
return TMH_RESPONSE_reply_json_pack (connection,
MHD_HTTP_NOT_FOUND,
"{s:I, s:s}",
- "code", (json_int_t) ec,
+ "code", (json_int_t) ec,
"error", object);
}
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-merchant] branch master updated: work on #5092, handle failure in easy case without asserting,
gnunet <=