Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-6]: src/lib/libedit Pull up following revision(s) (requested by c...



details:   https://anonhg.NetBSD.org/src/rev/b47db3cb3000
branches:  netbsd-6
changeset: 774165:b47db3cb3000
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Tue Jun 05 20:22:14 2012 +0000

description:
Pull up following revision(s) (requested by christos in ticket #309):
        lib/libedit/readline.c: revision 1.104
don't crash if add_history is called from an empty line. Called from
nslookup in new bind.
XXX: pullup to 6

diffstat:

 lib/libedit/readline.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r b20f16c19688 -r b47db3cb3000 lib/libedit/readline.c
--- a/lib/libedit/readline.c    Tue Jun 05 16:43:04 2012 +0000
+++ b/lib/libedit/readline.c    Tue Jun 05 20:22:14 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: readline.c,v 1.100 2011/11/18 20:38:42 christos Exp $  */
+/*     $NetBSD: readline.c,v 1.100.2.1 2012/06/05 20:22:14 bouyer Exp $        */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.100 2011/11/18 20:38:42 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.100.2.1 2012/06/05 20:22:14 bouyer Exp $");
 #endif /* not lint && not SCCSID */
 
 #include <sys/types.h>
@@ -1371,6 +1371,9 @@
 {
        HistEvent ev;
 
+       if (line == NULL)
+               return 0;
+
        if (h == NULL || e == NULL)
                rl_initialize();
 



Home | Main Index | Thread Index | Old Index