Module Name: src
Committed By: snj
Date: Sun Apr 19 15:48:10 UTC 2009
Modified Files:
src/dist/nvi/common [netbsd-5]: conv.h
src/dist/nvi/vi [netbsd-5]: vs_line.c
Log Message:
Pull up following revision(s) (requested by tnozaki in ticket #709):
dist/nvi/common/conv.h: revision 1.4 via patch
dist/nvi/vi/vs_line.c: revision 1.5 via patch
fix reliability issue.
if wcwidth(3) return -1, nvi may crash by memory fault.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2.6.1 -r1.1.1.2.6.2 src/dist/nvi/common/conv.h
cvs rdiff -u -r1.1.1.2.6.2 -r1.1.1.2.6.3 src/dist/nvi/vi/vs_line.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/nvi/common/conv.h
diff -u src/dist/nvi/common/conv.h:1.1.1.2.6.1 src/dist/nvi/common/conv.h:1.1.1.2.6.2
--- src/dist/nvi/common/conv.h:1.1.1.2.6.1 Tue Jan 20 02:41:11 2009
+++ src/dist/nvi/common/conv.h Sun Apr 19 15:48:09 2009
@@ -1,9 +1,10 @@
-/* $NetBSD: conv.h,v 1.1.1.2.6.1 2009/01/20 02:41:11 snj Exp $ */
+/* $NetBSD: conv.h,v 1.1.1.2.6.2 2009/04/19 15:48:09 snj Exp $ */
#define KEY_COL(sp, ch) \
- (INTISWIDE(ch) ? CHAR_WIDTH(sp, ch) ? CHAR_WIDTH(sp, ch) : \
- 1 : /* extra space */ \
- KEY_LEN(sp,ch))
+ (INTISWIDE(ch) ? \
+ (CHAR_WIDTH(sp, ch) >= 0) ? \
+ (size_t)CHAR_WIDTH(sp, ch) : 1 /* extra space */ \
+ : KEY_LEN(sp,ch))
struct _conv_win {
void *bp1;
Index: src/dist/nvi/vi/vs_line.c
diff -u src/dist/nvi/vi/vs_line.c:1.1.1.2.6.2 src/dist/nvi/vi/vs_line.c:1.1.1.2.6.3
--- src/dist/nvi/vi/vs_line.c:1.1.1.2.6.2 Tue Jan 20 02:48:58 2009
+++ src/dist/nvi/vi/vs_line.c Sun Apr 19 15:48:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vs_line.c,v 1.1.1.2.6.2 2009/01/20 02:48:58 snj Exp $ */
+/* $NetBSD: vs_line.c,v 1.1.1.2.6.3 2009/04/19 15:48:10 snj Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -442,7 +442,7 @@
/* XXXX this needs some rethinking */
if (INTISWIDE(ch)) {
/* Put a space before non-spacing char. */
- if (!CHAR_WIDTH(sp, ch))
+ if (CHAR_WIDTH(sp, ch) <= 0)
*cbp++ = L(' ');
*cbp++ = ch;
} else
