2062. [bug] 'dig +nssearch' was reusing a buffer before it had

                        been returned by the socket code. [RT #16307]

diff --git a/CHANGES b/CHANGES
index 5f35aeaffea4bcd537ee6e55355256cd70e64a2d..7b6c6df712b06c7ee142879d0e6f13976617b128 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2062.  [bug]           'dig +nssearch' was reusing a buffer before it had
+                       been returned by the socket code. [RT #16307]
+
 2057.  [bug]           Make setting "ra" dependent on both allow-query and
                        allow-recursion. [RT #16290]
 

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 8e11e538b1c929c5c94938166b1198741deaa956..9964f30c0e983408e898f4419b5b3e7723acfcd3 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.221.2.31 2006/06/07 00:29:43 marka Exp $ */
+/* $Id: dighost.c,v 1.221.2.32 2006/08/01 00:54:08 marka Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -154,6 +154,9 @@ cancel_lookup(dig_lookup_t *lookup);
 static void
 recv_done(isc_task_t *task, isc_event_t *event);
 
+static void
+send_udp(dig_query_t *query);
+
 static void
 connect_timeout(isc_task_t *task, isc_event_t *event);
 
@@ -1519,6 +1522,8 @@ static void
 send_done(isc_task_t *_task, isc_event_t *event) {
        isc_socketevent_t *sevent = (isc_socketevent_t *)event;
        isc_buffer_t *b = NULL;
+       dig_query_t *query, *next;
+       dig_lookup_t *l;
 
        REQUIRE(event->ev_type == ISC_SOCKEVENT_SENDDONE);
 
@@ -1526,17 +1531,28 @@ send_done(isc_task_t *_task, isc_event_t *event) {
 
        LOCK_LOOKUP;
 
+       debug("send_done()");
+       sendcount--;
+       debug("sendcount=%d", sendcount);
+       INSIST(sendcount >= 0);
+
        for  (b = ISC_LIST_HEAD(sevent->bufferlist);
              b != NULL;
              b = ISC_LIST_HEAD(sevent->bufferlist)) 
                ISC_LIST_DEQUEUE(sevent->bufferlist, b, link);
 
+       query = event->ev_arg;
+       l = query->lookup;
+
+       if (l->ns_search_only && !l->trace_root) {
+               debug("sending next, since searching");
+               next = ISC_LIST_NEXT(query, link);
+               if (next != NULL)
+                       send_udp(next);
+       }
+
        isc_event_free(&event);
 
-       debug("send_done()");
-       sendcount--;
-       debug("sendcount=%d", sendcount);
-       INSIST(sendcount >= 0);
        check_if_done();
        UNLOCK_LOOKUP;
 }
@@ -1684,7 +1700,6 @@ send_tcp_connect(dig_query_t *query) {
 static void
 send_udp(dig_query_t *query) {
        dig_lookup_t *l = NULL;
-       dig_query_t *next;
        isc_result_t result;
 
        debug("send_udp(%p)", query);
@@ -1742,16 +1757,6 @@ send_udp(dig_query_t *query) {
                                    &query->sockaddr, NULL);
        check_result(result, "isc_socket_sendtov");
        sendcount++;
-       /*
-        * If we're at the endgame of a nameserver search, we need to
-        * immediately bring up all the queries.  Do it here.
-        */
-       if (l->ns_search_only && !l->trace_root) {
-               debug("sending next, since searching");
-               next = ISC_LIST_NEXT(query, link);
-               if (next != NULL)
-                       send_udp(next);
-       }
 }
 
 /*