From: W.C.A. Wijngaards Date: Mon, 30 Nov 2020 08:41:33 +0000 (+0100) Subject: - Fix assertion failure on double callback when iterator loses X-Git-Tag: release-1.13.0rc4~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4bdc527baab8ed7aea6af3b9851ce4da241a1b7;p=thirdparty%2Funbound.git - Fix assertion failure on double callback when iterator loses interest in query at head of line that then has the tcp stream not kept for reuse. --- diff --git a/doc/Changelog b/doc/Changelog index 1019e32ae..b1146761f 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,8 @@ +30 November 2020: Wouter + - Fix assertion failure on double callback when iterator loses + interest in query at head of line that then has the tcp stream + not kept for reuse. + 27 November 2020: Wouter - Fix compile warning for type cast in http2_submit_dns_response. - Fix when use free buffer to initialize rbtree for stream reuse. diff --git a/services/outside_network.c b/services/outside_network.c index 2ced272b7..11951adea 100644 --- a/services/outside_network.c +++ b/services/outside_network.c @@ -2321,9 +2321,7 @@ reuse_tcp_remove_serviced_keep(struct waiting_tcp* w, * the stream itself. also keep it as an entry in the tree_by_id, * in case the answer returns (that we no longer want), but we cannot * pick the same ID number meanwhile */ - if(pend_tcp->query) { - pend_tcp->query->cb = NULL; - } + w->cb = NULL; /* see if can be entered in reuse tree * for that the FD has to be non-1 */ if(pend_tcp->c->fd == -1) {