Module Name: src
Committed By: tnozaki
Date: Sun Apr 19 02:28:19 UTC 2009
Modified Files:
src/dist/nvi/common: conv.h
src/dist/nvi/vi: vs_line.c
Log Message:
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.3 -r1.4 src/dist/nvi/common/conv.h
cvs rdiff -u -r1.4 -r1.5 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.3 src/dist/nvi/common/conv.h:1.4
--- src/dist/nvi/common/conv.h:1.3 Sun Jan 18 03:43:45 2009
+++ src/dist/nvi/common/conv.h Sun Apr 19 02:28:19 2009
@@ -1,8 +1,8 @@
-/* $NetBSD: conv.h,v 1.3 2009/01/18 03:43:45 lukem Exp $ */
+/* $NetBSD: conv.h,v 1.4 2009/04/19 02:28:19 tnozaki Exp $ */
#define KEY_COL(sp, ch) \
(INTISWIDE(ch) ? \
- (size_t)CHAR_WIDTH(sp, ch) ? \
+ (CHAR_WIDTH(sp, ch) >= 0) ? \
(size_t)CHAR_WIDTH(sp, ch) : 1 /* extra space */ \
: KEY_LEN(sp,ch))
Index: src/dist/nvi/vi/vs_line.c
diff -u src/dist/nvi/vi/vs_line.c:1.4 src/dist/nvi/vi/vs_line.c:1.5
--- src/dist/nvi/vi/vs_line.c:1.4 Sun Jan 18 03:45:50 2009
+++ src/dist/nvi/vi/vs_line.c Sun Apr 19 02:28:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vs_line.c,v 1.4 2009/01/18 03:45:50 lukem Exp $ */
+/* $NetBSD: vs_line.c,v 1.5 2009/04/19 02:28:19 tnozaki 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
