pullup:

1107.   [bug]           nsupdate could catch an assertion failure if an
			invalid domain name was given as the argument to
			the "zone" command.

diff --git a/CHANGES b/CHANGES
index 04497e283586bad7f0843b1a0cd52a8f0407ecc5..fe9bc1b6a581a5de88133577f84211ae4a2f3687 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1107.  [bug]           nsupdate could catch an assertion failure if an
+                       invalid domain name was given as the argument to
+                       the "zone" command.
+
 1106.  [bug]           After seeing an out of range TTL, nsupdate would
                        treat all TTLs as out of range. [RT #2001]
 

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 0f41a63143bc0649457fe3bbe14077c110ac762f..fefbf1411e3b9357b4b2b405a61e4d4f94cbc577 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.103.2.5 2001/11/06 20:42:01 gson Exp $ */
+/* $Id: nsupdate.c,v 1.103.2.6 2001/11/06 21:50:35 bwelling Exp $ */
 
 #include <config.h>
 
@@ -1089,6 +1089,7 @@ evaluate_zone(char *cmdline) {
        result = dns_name_fromtext(userzone, &b, dns_rootname, ISC_FALSE,
                                   NULL);
        if (result != ISC_R_SUCCESS) {
+               userzone = NULL; /* Lest it point to an invalid name */
                fprintf(stderr, "could not parse zone name\n");
                return (STATUS_SYNTAX);
        }