1668. [bug] DIG_SIGCHASE was making bin/dig/host dump core.

diff --git a/CHANGES b/CHANGES
index 65728fc60407764e030fc5afb7ec5576ca43df1a..5a835f029aa59d3254f12aff9de15434bc2ba65b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1668.  [bug]           DIG_SIGCHASE was making bin/dig/host dump core.
+
 1667.  [port]          linux: not all versions have IF_NAMESIZE.
 
 1666.  [bug]           The optional port on hostnames in dual-stack-servers

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index f91a28895396e6d9e9e1fa64fcb4706ce0541132..d8756c8817d2f126a7ffd7d4f40c5db91f8a2652 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.157.2.13.2.18 2004/06/07 03:56:25 marka Exp $ */
+/* $Id: dig.c,v 1.157.2.13.2.19 2004/06/19 02:30:10 sra Exp $ */
 
 #include <config.h>
 #include <stdlib.h>
@@ -41,15 +41,6 @@
 #include <dns/rdataclass.h>
 #include <dns/result.h>
 
-#ifdef DIG_SIGCHASE
-#ifndef DIG_SIGCHASE_BU
-#define DIG_SIGCHASE_BU 1
-#endif
-#ifndef DIG_SIGCHASE_TD
-#define DIG_SIGCHASE_TD 1
-#endif
-#endif
-
 #include <dig/dig.h>
 
 extern ISC_LIST(dig_lookup_t) lookup_list;

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index ad1fa3727d3387bac0dd7e5e5d77e8905cc5bd6e..1d527a8ccb817032ee7ced7179806ec1a84be7cb 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.19.2.12 2004/06/11 00:30:50 marka Exp $ */
+/* $Id: dighost.c,v 1.221.2.19.2.13 2004/06/19 02:30:11 sra Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -32,15 +32,6 @@
 #include <string.h>
 #include <limits.h>
 
-#ifdef DIG_SIGCHASE
-#ifndef DIG_SIGCHASE_BU
-#define DIG_SIGCHASE_BU 1
-#endif
-#ifndef DIG_SIGCHASE_TD
-#define DIG_SIGCHASE_TD 1
-#endif
-#endif 
-
 #include <dns/byaddr.h>
 #ifdef DIG_SIGCHASE
 #include <dns/dnssec.h>
@@ -2864,7 +2855,8 @@ recv_done(isc_task_t *task, isc_event_t *event) {
                                fatal("Memory allocation failure in %s:%d",
                                      __FILE__, __LINE__);
                        }
-                       ISC_LIST_APPEND(chase_message_list, chase_msg, link);
+                       ISC_LIST_INITANDAPPEND(chase_message_list, chase_msg,
+                                              link);
                        if (dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE,
                                               &msg_temp) != ISC_R_SUCCESS) {
                                fatal("dns_message_create in %s:%d",
@@ -2889,7 +2881,8 @@ recv_done(isc_task_t *task, isc_event_t *event) {
                                fatal("Memory allocation failure in %s:%d",
                                      __FILE__, __LINE__);
                        }
-                       ISC_LIST_APPEND(chase_message_list2, chase_msg2, link);
+                       ISC_LIST_INITANDAPPEND(chase_message_list2, chase_msg2,
+                                              link);
                        chase_msg2->msg = msg;
                }
 #endif

diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h
index 15562af422b75a6535021f5a0ab2bf76b1513fea..12e1e21dfd55f61825060bc5e62e78cec987139a 100644 (file)
--- a/bin/dig/include/dig/dig.h
+++ b/bin/dig/include/dig/dig.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.h,v 1.71.2.6.2.5 2004/04/13 03:00:07 marka Exp $ */
+/* $Id: dig.h,v 1.71.2.6.2.6 2004/06/19 02:30:12 sra Exp $ */
 
 #ifndef DIG_H
 #define DIG_H
@@ -74,6 +74,19 @@
  * be 1.
  */
 
+/*
+ * Defaults for the sigchase suboptions.  Consolidated here because
+ * these control the layout of dig_lookup_t (among other things).
+ */
+#ifdef DIG_SIGCHASE
+#ifndef DIG_SIGCHASE_BU
+#define DIG_SIGCHASE_BU 1
+#endif
+#ifndef DIG_SIGCHASE_TD
+#define DIG_SIGCHASE_TD 1
+#endif
+#endif
+
 ISC_LANG_BEGINDECLS
 
 typedef struct dig_lookup dig_lookup_t;

diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index 923ab8482c73e201bffd596e05dc4ae5e0df9e86..f4949201c54883ec6d02df69e1d5c1e59c7f9426 100644 (file)
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nslookup.c,v 1.90.2.4.2.5 2004/06/07 03:56:25 marka Exp $ */
+/* $Id: nslookup.c,v 1.90.2.4.2.6 2004/06/19 02:30:12 sra Exp $ */
 
 #include <config.h>
 
@@ -42,15 +42,6 @@
 #include <dns/rdatatype.h>
 #include <dns/byaddr.h>
 
-#ifdef DIG_SIGCHASE
-#ifndef DIG_SIGCHASE_BU
-#define DIG_SIGCHASE_BU 1
-#endif
-#ifndef DIG_SIGCHASE_TD
-#define DIG_SIGCHASE_TD 1
-#endif
-#endif
-
 #include <dig/dig.h>
 
 extern ISC_LIST(dig_lookup_t) lookup_list;