From: W.C.A. Wijngaards Date: Mon, 27 May 2019 09:23:41 +0000 (+0200) Subject: - Fix double file close in tcp pipelined response code. X-Git-Tag: release-1.9.2rc1~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a03f0a388eafdbea4b7361c8415ee3df3808d77d;p=thirdparty%2Funbound.git - Fix double file close in tcp pipelined response code. --- diff --git a/doc/Changelog b/doc/Changelog index 91d93e248..6fde83699 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +27 May 2019: Wouter + - Fix double file close in tcp pipelined response code. + 24 May 2019: Wouter - Fix that spoolbuf is not used to store tcp pipelined response between mesh send and callback end. diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c index a7a5ac0cb..6bada3577 100644 --- a/services/listen_dnsport.c +++ b/services/listen_dnsport.c @@ -1774,13 +1774,7 @@ tcp_req_info_handle_readdone(struct tcp_req_info* req) * If mesh failed to add a new entry and called commpoint_drop_reply. * Then the mesh state has been cleared. */ if(req->is_drop) { - /* we can now call drop_reply without recursing into ourselves - * whilst in the callback */ - /* we have to close the stream because there is no reply, - * no servfail to send, but the query needs an action, for - * a stream that is close the connection */ - sldns_buffer_clear(c->buffer); - comm_point_drop_reply(&c->repinfo); + /* the reply has been dropped, stream has been closed. */ return; } /* If mesh failed(mallocfail) and called commpoint_send_reply with