3379. [bug] nsupdate terminated unexpectedly in interactive mode

                        if built with readline support. [RT #29550]

diff --git a/CHANGES b/CHANGES
index 1b8a43716ff63eb304b51ff3d736df4be3027631..f85f201deeaf0a2d931ea698be9ae24b8b4c038a 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.
 
 3367.  [bug]           dns_dnsseckey_create() result was not being checked.

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 743f32134687a27873d2ccf25a68988dba1ca4a3..3a1b6e900880d04f547f65cea6395f5d94698ebb 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -1122,7 +1122,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);
        }
@@ -1220,7 +1220,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;
                }
@@ -1236,7 +1236,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;
                        }
@@ -1310,7 +1310,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);
        }
@@ -1344,14 +1344,14 @@ evaluate_server(char *cmdline) {
        }
 
        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 = dnsport;
        else {
                char *endp;
@@ -1385,14 +1385,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;
@@ -1441,7 +1441,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);
        }
@@ -1465,7 +1465,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);
        }
@@ -1506,7 +1506,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);
        }
@@ -1532,7 +1532,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;
@@ -1557,7 +1557,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);
        }
@@ -1591,7 +1591,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);
        }
@@ -1649,7 +1649,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;
@@ -1690,7 +1690,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;
@@ -1714,7 +1714,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;
@@ -1794,7 +1794,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);
        }
@@ -1884,6 +1884,7 @@ get_next_command(void) {
        char cmdlinebuf[MAXCMD];
        char *cmdline;
        char *word;
+       char *tmp;
 
        ddebug("get_next_command()");
        if (interactive) {
@@ -1895,11 +1896,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 ea858dcc13bff79ca2b54beec5f879cf5bbf3132..46cc1b3d228d03e2cc0800184be05a0c5b03882f 100644 (file)
--- a/bin/tests/system/nsupdate/tests.sh
+++ b/bin/tests/system/nsupdate/tests.sh
@@ -428,5 +428,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