- Fix #747: assert in outnet_serviced_query_stop.

git-svn-id: file:///svn/unbound/trunk@3646 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 24ec0467d8bf2b664988a6dae04f84110af04444..dba0888f97dbf2dac9f828500477d521b6ae48ee 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+07 March 2016: Wouter
+       - Fix #747: assert in outnet_serviced_query_stop.
+
 03 March 2016: Wouter
        - configure tests for the weak attribute support by the compiler.
 

diff --git a/services/outside_network.c b/services/outside_network.c
index b5e0b2d0a09f352ce4d490bb3a41fff38ec1567e..25e1e17e410c371ce37a2be2dd3db349ae746604 100644 (file)
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1948,13 +1948,7 @@ void outnet_serviced_query_stop(struct serviced_query* sq, void* cb_arg)
        callback_list_remove(sq, cb_arg);
        /* if callbacks() routine scheduled deletion, let it do that */
        if(!sq->cblist && !sq->to_be_deleted) {
-#ifdef UNBOUND_DEBUG
-               rbnode_t* rem =
-#else
-               (void)
-#endif
-               rbtree_delete(sq->outnet->serviced, sq);
-               log_assert(rem); /* should be present */
+               (void)rbtree_delete(sq->outnet->serviced, sq);
                serviced_delete(sq); 
        }
 }