- 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 1019e32ae73b37fc4337e332e6b028db35dfc804..b1146761f59efd897e2bd719d7f2fe884b30362a 100644 (file)
--- 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 2ced272b726869ddbfe836e75c93e76c0c6ea611..11951adea7bc48566b976426051a5c79607063ad 100644 (file)
--- 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) {