Module Name: src
Committed By: christos
Date: Sun Nov 13 15:24:04 UTC 2011
Modified Files:
src/lib/libterminfo: termcap.c
Log Message:
make use we don't touch memory past the end of the buffer. Pointed out
by tnozaki.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/libterminfo/termcap.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/libterminfo/termcap.c
diff -u src/lib/libterminfo/termcap.c:1.16 src/lib/libterminfo/termcap.c:1.17
--- src/lib/libterminfo/termcap.c:1.16 Mon Oct 3 08:31:51 2011
+++ src/lib/libterminfo/termcap.c Sun Nov 13 10:24:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: termcap.c,v 1.16 2011/10/03 12:31:51 roy Exp $ */
+/* $NetBSD: termcap.c,v 1.17 2011/11/13 15:24:04 christos Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: termcap.c,v 1.16 2011/10/03 12:31:51 roy Exp $");
+__RCSID("$NetBSD: termcap.c,v 1.17 2011/11/13 15:24:04 christos Exp $");
#include <assert.h>
#include <ctype.h>
@@ -79,7 +79,7 @@ tgetflag(const char *id2)
uint32_t ind;
size_t i;
TERMUSERDEF *ud;
- const char id[] = { id2[0], id2[1], '\0' };
+ const char id[] = { id2[0], id2[0] ? id2[1] : '\0', '\0' };
if (cur_term == NULL)
return 0;
@@ -104,7 +104,7 @@ tgetnum(const char *id2)
size_t i;
TERMUSERDEF *ud;
const TENTRY *te;
- const char id[] = { id2[0], id2[1], '\0' };
+ const char id[] = { id2[0], id2[0] ? id2[1] : '\0', '\0' };
if (cur_term == NULL)
return -1;
@@ -136,7 +136,7 @@ tgetstr(const char *id2, char **area)
size_t i;
TERMUSERDEF *ud;
const char *str;
- const char id[] = { id2[0], id2[1], '\0' };
+ const char id[] = { id2[0], id2[0] ? id2[1] : '\0', '\0' };
if (cur_term == NULL)
return NULL;
