1 files changed, 11 insertions, 0 deletions

diff --git a/src/util/container_heap.c b/src/util/container_heap.c
index 1e7077c80..b5ccd7950 100644
--- a/src/util/container_heap.c
+++ b/src/util/container_heap.c
@@ -331,6 +331,8 @@ GNUNET_CONTAINER_heap_remove_node (struct GNUNET_CONTAINER_Heap *root,
 
   if (del_node == NULL)
     return NULL;
+  else if (del_node == root->root)
+    return GNUNET_CONTAINER_heap_remove_root (root);
 
   ret = del_node->element;
   last = getPos (root, root->size);
@@ -410,6 +412,15 @@ GNUNET_CONTAINER_heap_remove_root (struct GNUNET_CONTAINER_Heap *root)
   ret = root_node->element;
   last = getPos (root, root->size);
 
+  if ((root_node == last) && (root->size == 1)) 
+    {
+      /* We are removing the last node in the heap! */
+      root->root = NULL;
+      root->traversal_pos = NULL;
+      root->size = 0;
+      return ret;
+    }
+
   if (last->parent->left_child == last)
     last->parent->left_child = NULL;
   else if (last->parent->right_child == last)