2750. [bug] dig: assertion failure could occur when a server

			didn't have an address. [RT #20579]

diff --git a/CHANGES b/CHANGES
index 5989411ce5a263ada65c4ce6820e0bc7c72fcffd..cf63a4b3230f913e6fe699904dceb572cd8379af 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2750.  [bug]           dig: assertion failure could occur when a server
+                       didn't have an address. [RT #20579]
+
 2729.  [func]          When constructing a CNAME from a DNAME use the DNAME
                        TTL. [RT #20451]
 

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 09c2cdafddb9f7ed8df3659655c6b8ae62827887..1d448ed2261892006d1a083a76e3ed4595a8d65c 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.304.12.16 2009/06/24 03:42:32 marka Exp $ */
+/* $Id: dighost.c,v 1.304.12.17 2009/11/05 01:57:08 each Exp $ */
 
 /*! \file
  *  \note
@@ -2398,13 +2398,15 @@ connect_timeout(isc_task_t *task, isc_event_t *event) {
                cq = query->lookup->current_query;
                if (!l->tcp_mode)
                        send_udp(ISC_LIST_NEXT(cq, link));
-               else {
+               else if (query->sock != NULL) {
                        isc_socket_cancel(query->sock, NULL,
                                          ISC_SOCKCANCEL_ALL);
                        isc_socket_detach(&query->sock);
                        sockcount--;
                        debug("sockcount=%d", sockcount);
                        send_tcp_connect(ISC_LIST_NEXT(cq, link));
+               } else {
+                       send_tcp_connect(ISC_LIST_NEXT(cq, link));
                }
                UNLOCK_LOOKUP;
                return;