- Fix double file close in tcp pipelined response code.

diff --git a/doc/Changelog b/doc/Changelog
index 91d93e2481c931b4555da7ed99023505064c55c6..6fde836997e8861fab58746d5579f11312077ab6 100644 (file)
--- 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 a7a5ac0cbccac2f76a727d65832ce91f97189f2d..6bada3577e355d3e78d45dc7516ba1591b701c7b 100644 (file)
--- 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