[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated: fix
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] branch master updated: fix |
Date: |
Wed, 05 Jun 2019 13:00:47 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 6a8ff6f7f fix
6a8ff6f7f is described below
commit 6a8ff6f7fe858899a2f6418691b01120323a10d4
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Wed Jun 5 13:00:06 2019 +0200
fix
---
src/reclaim/json_reclaim.c | 2 +-
src/reclaim/plugin_rest_reclaim.c | 16 +++++++---------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/reclaim/json_reclaim.c b/src/reclaim/json_reclaim.c
index 222cf1dbf..557caafe2 100644
--- a/src/reclaim/json_reclaim.c
+++ b/src/reclaim/json_reclaim.c
@@ -171,7 +171,7 @@ parse_ticket (void *cls, json_t *root, struct
GNUNET_JSON_Specification *spec)
&rnd_str,
"audience",
&aud_str,
- "identity",
+ "issuer",
&id_str);
if (0 != unpack_state)
{
diff --git a/src/reclaim/plugin_rest_reclaim.c
b/src/reclaim/plugin_rest_reclaim.c
index 7fe5283c4..9e57f4f46 100644
--- a/src/reclaim/plugin_rest_reclaim.c
+++ b/src/reclaim/plugin_rest_reclaim.c
@@ -719,15 +719,6 @@ revoke_ticket_cont (struct GNUNET_REST_RequestHandle
*con_handle,
GNUNET_memcpy (term_data, handle->rest_handle->data,
handle->rest_handle->data_size);
data_json = json_loads (term_data, JSON_DECODE_ANY, &err);
- GNUNET_assert (GNUNET_OK ==
- GNUNET_JSON_parse (data_json, tktspec, NULL, NULL));
- json_decref (data_json);
- if (NULL == ticket) {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unable to parse ticket from %s\n",
- term_data);
- GNUNET_SCHEDULER_add_now (&do_error, handle);
- return;
- }
if (GNUNET_OK != GNUNET_JSON_parse (data_json, tktspec, NULL, NULL)) {
handle->emsg = GNUNET_strdup ("Not a ticket!\n");
GNUNET_SCHEDULER_add_now (&do_error, handle);
@@ -735,6 +726,13 @@ revoke_ticket_cont (struct GNUNET_REST_RequestHandle
*con_handle,
json_decref (data_json);
return;
}
+ json_decref (data_json);
+ if (NULL == ticket) {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unable to parse ticket from %s\n",
+ term_data);
+ GNUNET_SCHEDULER_add_now (&do_error, handle);
+ return;
+ }
for (ego_entry = handle->ego_head; NULL != ego_entry;
ego_entry = ego_entry->next) {
--
To stop receiving notification emails like this one, please contact
address@hidden