Source-Changes-HG archive

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

[src/trunk]: src/lib/libedit put back NUL check (Ingo Schwarze)



details:   https://anonhg.NetBSD.org/src/rev/1e8bb693ec29
branches:  trunk
changeset: 344312:1e8bb693ec29
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Mar 22 01:38:17 2016 +0000

description:
put back NUL check (Ingo Schwarze)

diffstat:

 lib/libedit/terminal.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 1dfe1b889e78 -r 1e8bb693ec29 lib/libedit/terminal.c
--- a/lib/libedit/terminal.c    Tue Mar 22 01:34:32 2016 +0000
+++ b/lib/libedit/terminal.c    Tue Mar 22 01:38:17 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: terminal.c,v 1.23 2016/03/02 19:24:20 christos Exp $   */
+/*     $NetBSD: terminal.c,v 1.24 2016/03/22 01:38:17 christos Exp $   */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)term.c     8.2 (Berkeley) 4/30/95";
 #else
-__RCSID("$NetBSD: terminal.c,v 1.23 2016/03/02 19:24:20 christos Exp $");
+__RCSID("$NetBSD: terminal.c,v 1.24 2016/03/22 01:38:17 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -378,7 +378,7 @@
          */
        tlen = 0;
        for (tmp = tlist; tmp < &tlist[T_str]; tmp++)
-               if (*tmp != NULL && *tmp != *str) {
+               if (*tmp != NULL && **tmp != '\0' && *tmp != *str) {
                        char *ptr;
 
                        for (ptr = *tmp; *ptr != '\0'; termbuf[tlen++] = *ptr++)



Home | Main Index | Thread Index | Old Index