[GNUnet-SVN] [gnunet] branch master updated: do not invoke callback after set operation destruction, should fix #5082

[gnunet]

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

grothoff pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new dcf86b6d0 do not invoke callback after set operation destruction, 
should fix #5082
dcf86b6d0 is described below

commit dcf86b6d0f1caf789342c9903a16b2c44a1621cc
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon Jul 3 17:38:20 2017 +0200

    do not invoke callback after set operation destruction, should fix #5082
---
 src/set/set_api.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/set/set_api.c b/src/set/set_api.c
index 27e2ccf04..1d0d00b44 100644
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -497,7 +497,8 @@ set_operation_destroy (struct GNUNET_SET_OperationHandle 
*oh)
                                  oh);
     h_assoc = GNUNET_MQ_assoc_remove (set->mq,
                                       oh->request_id);
-    GNUNET_assert ((NULL == h_assoc) || (h_assoc == oh));
+    GNUNET_assert ( (NULL == h_assoc) ||
+                   (h_assoc == oh) );
   }
   GNUNET_free (oh);
 }
@@ -556,7 +557,8 @@ handle_client_set_error (void *cls,
        error);
   while (NULL != set->ops_head)
   {
-    if (NULL != set->ops_head->result_cb)
+    if ( (NULL != set->ops_head->result_cb) &&
+        (GNUNET_NO == set->destroy_requested) )
       set->ops_head->result_cb (set->ops_head->result_cls,
                                 NULL,
                                 0,

-- 
To stop receiving notification emails like this one, please contact
address@hidden