fix
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Wed, 5 Jun 2019 11:00:06 +0000 (13:00 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Wed, 5 Jun 2019 11:00:06 +0000 (13:00 +0200)
src/reclaim/json_reclaim.c
src/reclaim/plugin_rest_reclaim.c

index 222cf1dbfec72bebc68701a49f80330b656f6ea5..557caafe2dd5bdbb16abceaaffad45fbe9bca12c 100644 (file)
@@ -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)
   {
index 7fe5283c40a19df62a4e98e6691e2f44387b7a28..9e57f4f465206a046beed449507ca68d87509553 100644 (file)
@@ -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) {