Module Name: src
Committed By: christos
Date: Mon Oct 19 00:36:27 UTC 2015
Modified Files:
src/lib/libedit: vi.c
Log Message:
make sure we have space for NUL and NUL terminate buffer array (Jilles Tjoelker)
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/lib/libedit/vi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/vi.c
diff -u src/lib/libedit/vi.c:1.45 src/lib/libedit/vi.c:1.46
--- src/lib/libedit/vi.c:1.45 Wed Jun 18 14:12:28 2014
+++ src/lib/libedit/vi.c Sun Oct 18 20:36:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vi.c,v 1.45 2014/06/18 18:12:28 christos Exp $ */
+/* $NetBSD: vi.c,v 1.46 2015/10/19 00:36:27 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)vi.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: vi.c,v 1.45 2014/06/18 18:12:28 christos Exp $");
+__RCSID("$NetBSD: vi.c,v 1.46 2015/10/19 00:36:27 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -1038,12 +1038,13 @@ vi_histedit(EditLine *el, Int c __attrib
while (waitpid(pid, &status, 0) != pid)
continue;
lseek(fd, (off_t)0, SEEK_SET);
- st = read(fd, cp, TMP_BUFSIZ);
+ st = read(fd, cp, TMP_BUFSIZ - 1);
if (st > 0) {
+ cp[st] = '\0';
len = (size_t)(el->el_line.lastchar -
el->el_line.buffer);
len = ct_mbstowcs(el->el_line.buffer, cp, len);
- if (len > 0 && el->el_line.buffer[len -1] == '\n')
+ if (len > 0 && el->el_line.buffer[len - 1] == '\n')
--len;
}
else
