[GNUnet-SVN] [gnunet] branch master updated: fix bug where we might fail the resolution of the same DHT heap node twice due to async cleanup

[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 4b9c0d3a0 fix bug where we might fail the resolution of the same DHT 
heap node twice due to async cleanup
4b9c0d3a0 is described below

commit 4b9c0d3a08c214719aa32d2cbd689c158634f12b
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed May 23 23:08:03 2018 +0200

    fix bug where we might fail the resolution of the same DHT heap node twice 
due to async cleanup
---
 src/gns/gnunet-service-gns_resolver.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gns/gnunet-service-gns_resolver.c 
b/src/gns/gnunet-service-gns_resolver.c
index 8593e281e..d3c07e997 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -2400,7 +2400,8 @@ start_dht_request (struct GNS_ResolverHandle *rh,
   if (GNUNET_CONTAINER_heap_get_size (dht_lookup_heap) > 
max_allowed_background_queries)
   {
     /* fail longest-standing DHT request */
-    rx = GNUNET_CONTAINER_heap_peek (dht_lookup_heap);
+    rx = GNUNET_CONTAINER_heap_remove_root (dht_lookup_heap);
+    rx->dht_heap_node = NULL;
     GNUNET_assert (NULL != rx);
     fail_resolution (rx);
   }

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