[taler-anastasis] branch master updated: fix cleanup sequence

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new 07a8f4c  fix cleanup sequence
07a8f4c is described below

commit 07a8f4c438719729078bef88279c5de344ac5e04
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Nov 30 22:27:06 2020 +0100

    fix cleanup sequence
---
 src/lib/testing_cmd_recover_secret.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/lib/testing_cmd_recover_secret.c 
b/src/lib/testing_cmd_recover_secret.c
index b66cb19..956ae88 100644
--- a/src/lib/testing_cmd_recover_secret.c
+++ b/src/lib/testing_cmd_recover_secret.c
@@ -116,9 +116,12 @@ core_secret_cb (void *cls,
                 const void *secret,
                 size_t secret_size)
 {
+  struct RecoverSecretState *rss = cls;
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "At %s:%d arrived at core secret cb \n", __FILE__, __LINE__);
-  struct RecoverSecretState *rss = cls;
+
+  rss->recovery = NULL;
   if (0 != memcmp (secret, rss->core_secret, secret_size))
   {
     GNUNET_break (0);
@@ -228,8 +231,15 @@ recover_secret_cleanup (void *cls,
   // FIXME: Cleanup logic
   struct RecoverSecretState *rss = cls;
 
-  (void) GNUNET_SCHEDULER_add_now (&delayed_abort,
-                                   rss->recovery);
+  if (NULL != rss->recovery)
+  {
+    /* must run first, or at least before #core_secret_cb */
+    (void) GNUNET_SCHEDULER_add_with_priority (
+      GNUNET_SCHEDULER_PRIORITY_SHUTDOWN,
+      &delayed_abort,
+      rss->recovery);
+    rss->recovery = NULL;
+  }
   json_decref (rss->id_data);
   GNUNET_free (rss->ri->cs);
   GNUNET_free (rss->ri->dps);

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.