From owner-svn-src-all@FreeBSD.ORG  Wed Sep 25 20:37:16 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id EA7BA62B;
 Wed, 25 Sep 2013 20:37:16 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D7E7F225D;
 Wed, 25 Sep 2013 20:37:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8PKbGj5018601;
 Wed, 25 Sep 2013 20:37:16 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8PKbG9K018599;
 Wed, 25 Sep 2013 20:37:16 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201309252037.r8PKbG9K018599@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 25 Sep 2013 20:37:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255873 - in head/contrib/bind9/bin: dig nsupdate
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Sep 2013 20:37:17 -0000

Author: delphij
Date: Wed Sep 25 20:37:16 2013
New Revision: 255873
URL: http://svnweb.freebsd.org/changeset/base/255873

Log:
  Correct a NULL pointer deference in nslookup and nsupdate that would
  cause the utility to crash in interactive mode when the user gives
  an EOF on standard input.
  
  MFC after:	3 days
  Approved by:	re (gjb)

Modified:
  head/contrib/bind9/bin/dig/nslookup.c
  head/contrib/bind9/bin/nsupdate/nsupdate.c

Modified: head/contrib/bind9/bin/dig/nslookup.c
==============================================================================
--- head/contrib/bind9/bin/dig/nslookup.c	Wed Sep 25 20:06:01 2013	(r255872)
+++ head/contrib/bind9/bin/dig/nslookup.c	Wed Sep 25 20:37:16 2013	(r255873)
@@ -767,7 +767,8 @@ get_next_command(void) {
 	if (interactive) {
 #ifdef HAVE_READLINE
 		ptr = readline("> ");
-		add_history(ptr);
+		if (ptr != NULL && *ptr != '\0')
+			add_history(ptr);
 #else
 		fputs("> ", stderr);
 		fflush(stderr);

Modified: head/contrib/bind9/bin/nsupdate/nsupdate.c
==============================================================================
--- head/contrib/bind9/bin/nsupdate/nsupdate.c	Wed Sep 25 20:06:01 2013	(r255872)
+++ head/contrib/bind9/bin/nsupdate/nsupdate.c	Wed Sep 25 20:37:16 2013	(r255873)
@@ -2008,7 +2008,8 @@ get_next_command(void) {
 	if (interactive) {
 #ifdef HAVE_READLINE
 		cmdline = readline("> ");
-		add_history(cmdline);
+		if (cmdline != NULL && *cmdline != '\0')
+			add_history(cmdline);
 #else
 		fprintf(stdout, "> ");
 		fflush(stdout);