3379. [bug] nsupdate terminated unexpectedly in interactive mode

                        if built with readline support. [RT #29550]

diff --git a/CHANGES b/CHANGES
index fc7bab6c248a5ee7f6384422a487fefb25aa164b..bae1474ea79c570d75ee71039556e062cb155036 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3379.  [bug]           nsupdate terminated unexpectedly in interactive mode
+                       if built with readline support. [RT #29550]
+
 3368.  [bug]           <dns/iptable.h> and <dns/zone.h> were not C++ safe.
 
 3366.  [bug]           Fixed Read-After-Write dependency violation for IA64 

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 3c10b5fd369f67288a6f2c24350995b76203c814..298f3a1dbac564838ea65f146d097e9f1d0d8121 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -1011,7 +1011,7 @@ parse_name(char **cmdlinep, dns_message_t *msg, dns_name_t **namep) {
        isc_buffer_t source;
 
        word = nsu_strsep(cmdlinep, " \t\r\n");
-       if (*word == 0) {
+       if (word == NULL || *word == 0) {
                fprintf(stderr, "could not read owner name\n");
                return (STATUS_SYNTAX);
        }
@@ -1110,7 +1110,7 @@ make_prereq(char *cmdline, isc_boolean_t ispositive, isc_boolean_t isrrset) {
         */
        if (isrrset) {
                word = nsu_strsep(&cmdline, " \t\r\n");
-               if (*word == 0) {
+               if (word == NULL || *word == 0) {
                        fprintf(stderr, "could not read class or type\n");
                        goto failure;
                }
@@ -1126,7 +1126,7 @@ make_prereq(char *cmdline, isc_boolean_t ispositive, isc_boolean_t isrrset) {
                         * Now read the type.
                         */
                        word = nsu_strsep(&cmdline, " \t\r\n");
-                       if (*word == 0) {
+                       if (word == NULL || *word == 0) {
                                fprintf(stderr, "could not read type\n");
                                goto failure;
                        }
@@ -1200,7 +1200,7 @@ evaluate_prereq(char *cmdline) {
 
        ddebug("evaluate_prereq()");
        word = nsu_strsep(&cmdline, " \t\r\n");
-       if (*word == 0) {
+       if (word == NULL || *word == 0) {
                fprintf(stderr, "could not read operation code\n");
                return (STATUS_SYNTAX);
        }
@@ -1229,14 +1229,14 @@ evaluate_server(char *cmdline) {
        long port;
 
        word = nsu_strsep(&cmdline, " \t\r\n");
-       if (*word == 0) {
+       if (word == NULL || *word == 0) {
                fprintf(stderr, "could not read server name\n");
                return (STATUS_SYNTAX);
        }
        server = word;
 
        word = nsu_strsep(&cmdline, " \t\r\n");
-       if (*word == 0)
+       if (word == NULL || *word == 0)
                port = DNSDEFAULTPORT;
        else {
                char *endp;
@@ -1270,14 +1270,14 @@ evaluate_local(char *cmdline) {
        struct in6_addr in6;
 
        word = nsu_strsep(&cmdline, " \t\r\n");
-       if (*word == 0) {
+       if (word == NULL || *word == 0) {
                fprintf(stderr, "could not read server name\n");
                return (STATUS_SYNTAX);
        }
        local = word;
 
        word = nsu_strsep(&cmdline, " \t\r\n");
-       if (*word == 0)
+       if (word == NULL || *word == 0)
                port = 0;
        else {
                char *endp;
@@ -1326,7 +1326,7 @@ evaluate_key(char *cmdline) {
        char *n;
 
        namestr = nsu_strsep(&cmdline, " \t\r\n");
-       if (*namestr == 0) {
+       if (namestr == NULL || *namestr == 0) {
                fprintf(stderr, "could not read key name\n");
                return (STATUS_SYNTAX);
        }
@@ -1350,7 +1350,7 @@ evaluate_key(char *cmdline) {
        }
 
        secretstr = nsu_strsep(&cmdline, "\r\n");
-       if (*secretstr == 0) {
+       if (secretstr == NULL || *secretstr == 0) {
                fprintf(stderr, "could not read key secret\n");
                return (STATUS_SYNTAX);
        }
@@ -1391,7 +1391,7 @@ evaluate_zone(char *cmdline) {
        isc_result_t result;
 
        word = nsu_strsep(&cmdline, " \t\r\n");
-       if (*word == 0) {
+       if (word == NULL || *word == 0) {
                fprintf(stderr, "could not read zone name\n");
                return (STATUS_SYNTAX);
        }
@@ -1418,7 +1418,7 @@ evaluate_realm(char *cmdline) {
        char buf[1024];
 
        word = nsu_strsep(&cmdline, " \t\r\n");
-       if (*word == 0) {
+       if (word == NULL || *word == 0) {
                if (realm != NULL)
                        isc_mem_free(mctx, realm);
                realm = NULL;
@@ -1443,7 +1443,7 @@ evaluate_ttl(char *cmdline) {
        isc_uint32_t ttl;
 
        word = nsu_strsep(&cmdline, " \t\r\n");
-       if (*word == 0) {
+       if (word == NULL || *word == 0) {
                fprintf(stderr, "could not ttl\n");
                return (STATUS_SYNTAX);
        }
@@ -1477,7 +1477,7 @@ evaluate_class(char *cmdline) {
        dns_rdataclass_t rdclass;
 
        word = nsu_strsep(&cmdline, " \t\r\n");
-       if (*word == 0) {
+       if (word == NULL || *word == 0) {
                fprintf(stderr, "could not read class name\n");
                return (STATUS_SYNTAX);
        }
@@ -1535,7 +1535,7 @@ update_addordelete(char *cmdline, isc_boolean_t isdelete) {
         * If it's a delete, ignore a TTL if present (for compatibility).
         */
        word = nsu_strsep(&cmdline, " \t\r\n");
-       if (*word == 0) {
+       if (word == NULL || *word == 0) {
                if (!isdelete) {
                        fprintf(stderr, "could not read owner ttl\n");
                        goto failure;
@@ -1576,7 +1576,7 @@ update_addordelete(char *cmdline, isc_boolean_t isdelete) {
         */
        word = nsu_strsep(&cmdline, " \t\r\n");
  parseclass:
-       if (*word == 0) {
+       if (word == NULL || *word == 0) {
                if (isdelete) {
                        rdataclass = dns_rdataclass_any;
                        rdatatype = dns_rdatatype_any;
@@ -1600,7 +1600,7 @@ update_addordelete(char *cmdline, isc_boolean_t isdelete) {
                 * Now read the type.
                 */
                word = nsu_strsep(&cmdline, " \t\r\n");
-               if (*word == 0) {
+               if (word == NULL || *word == 0) {
                        if (isdelete) {
                                rdataclass = dns_rdataclass_any;
                                rdatatype = dns_rdatatype_any;
@@ -1680,7 +1680,7 @@ evaluate_update(char *cmdline) {
 
        ddebug("evaluate_update()");
        word = nsu_strsep(&cmdline, " \t\r\n");
-       if (*word == 0) {
+       if (word == NULL || *word == 0) {
                fprintf(stderr, "could not read operation code\n");
                return (STATUS_SYNTAX);
        }
@@ -1770,6 +1770,7 @@ get_next_command(void) {
        char cmdlinebuf[MAXCMD];
        char *cmdline;
        char *word;
+       char *tmp;
 
        ddebug("get_next_command()");
        if (interactive) {
@@ -1781,11 +1782,18 @@ get_next_command(void) {
        isc_app_unblock();
        if (cmdline == NULL)
                return (STATUS_QUIT);
+
+       /*
+        * Normalize input by removing any eol.
+        */
+       tmp = cmdline;
+       (void)nsu_strsep(&tmp, "\r\n");
+
        word = nsu_strsep(&cmdline, " \t\r\n");
 
        if (feof(input))
                return (STATUS_QUIT);
-       if (*word == 0)
+       if (word == NULL || *word == 0)
                return (STATUS_SEND);
        if (word[0] == ';')
                return (STATUS_MORE);

diff --git a/bin/tests/system/nsupdate/commandlist b/bin/tests/system/nsupdate/commandlist
new file mode 100644 (file)
index 0000000..41c8049
--- /dev/null
+++ b/bin/tests/system/nsupdate/commandlist
@@ -0,0 +1,15 @@
+server 127.0.0.1
+server 127.0.0.1 port
+update
+update delete
+update delete dummy
+update delete dummy in
+update delete dummy in a
+update delete dummy in a 127.0.0.1
+update add
+update add domain
+update add domain 0
+update add domain 0 in
+update add domain 0 in a
+update add domain 0 a
+update add domain 0 a in

diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh
index 2cb2aa6643c44dc35a27cc5e164bf3fbfb4ad144..44b0a8e365e3311357137edc26813d09ab94a3f8 100644 (file)
--- a/bin/tests/system/nsupdate/tests.sh
+++ b/bin/tests/system/nsupdate/tests.sh
@@ -254,5 +254,28 @@ then
        echo "I:failed"; status=1
 fi
 
+n=`expr $n + 1`
+ret=0
+echo "I:check command list ($n)"
+(
+while read cmd 
+do
+    echo "$cmd" | $NSUPDATE  > /dev/null 2>&1
+    if test $? -gt 1 ; then
+       echo "I: failed ($cmd)"
+       ret=1
+    fi
+    echo "$cmd " | $NSUPDATE  > /dev/null 2>&1
+    if test $? -gt 1 ; then
+       echo "I: failed ($cmd)"
+       ret=1
+    fi
+done
+exit $ret
+) < commandlist || ret=1
+if [ $ret -ne 0 ]; then
+    status=1
+fi
+
 echo "I:exit status: $status"
 exit $status