From 4f1625afb7db2eec43dd75be10af55a9eb88b528 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Mon, 7 Mar 2016 10:00:08 +0000 Subject: [PATCH] - Fix #747: assert in outnet_serviced_query_stop. git-svn-id: file:///svn/unbound/trunk@3646 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 3 +++ services/outside_network.c | 8 +------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index 24ec0467d..dba0888f9 100644 --- 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 b5e0b2d0a..25e1e17e4 100644 --- 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); } } -- 2.47.2