From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 19 Jun 2020 16:04:12 +0000 (+0200)
Subject: fix crash on cleanup.
X-Git-Tag: release-1.13.0rc1~5^2~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d96e718f802baa1fed344c76cc22770c0a521c3f;p=thirdparty%2Funbound.git

fix crash on cleanup.
---

diff --git a/services/outside_network.c b/services/outside_network.c
index 0b155616f..99b969026 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1488,7 +1488,8 @@ outnet_tcptimer(void* arg)
 		fptr_ok(fptr_whitelist_pending_tcp(cb));
 		(void)(*cb)(NULL, cb_arg, NETEVENT_TIMEOUT, NULL);
 	} else {
-		waiting_tcp_delete(w);
+		/* waiting_tcp_delete(w); -- should be deleted if entire
+		 * stream with reuse elements is gone. TODO remove this? */
 	}
 	use_free_buffer(outnet);
 }
@@ -1718,6 +1719,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	w->addrlen = sq->addrlen;
 	w->outnet = sq->outnet;
 	w->on_tcp_waiting_list = 0;
+	w->next_waiting = NULL;
 	w->cb = callback;
 	w->cb_arg = callback_arg;
 	w->ssl_upstream = sq->ssl_upstream;