PATCH: fix line-length calculation in zle_refresh.c:singlerefresh()

[Daiki Ueno <ueno@unixuser.org>]

[-- Attachment #1: Type: text/plain, Size: 501 bytes --]

Hi,

If multibyte support is enabled and TERM is dumb, typing double-width
characters causes segmentation fault:

ueno@localhost % LANG=en_US.utf8 TERM=dumb zsh -f
localhost% <-- type あ with some input method
*** glibc detected *** zsh: free(): invalid next size (fast): 0x00000000018dd500 ***
zsh: abort (core dumped)  LANG=en_US.utf8 TERM=dumb zsh -f

This is because zle_refresh.c:singlerefresh() does not calculate the
size of new line buffer correctly.  Here is a patch for this.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-line-length-calculation-in-zle_refresh.patch --]
[-- Type: text/x-patch, Size: 935 bytes --]

>From 9f9268512c0ab717e67d9e6881d44dd1cdaa37b2 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Mon, 2 Aug 2010 12:37:41 +0900
Subject: [PATCH] Fix line-length calculation in zle_refresh.

---
 Src/Zle/zle_refresh.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c
index 352dcf0..f03e7dc 100644
--- a/Src/Zle/zle_refresh.c
+++ b/Src/Zle/zle_refresh.c
@@ -2341,7 +2341,7 @@ singlerefresh(ZLE_STRING_T tmpline, int tmpll, int tmpcs)
 	if (tmpline[t0] == ZWC('\t'))
 	    vsiz = (vsiz | 7) + 2;
 #ifdef MULTIBYTE_SUPPORT
-	else if (iswprint(tmpline[t0]) && (width = WCWIDTH(tmpline[t0]) > 0)) {
+	else if (iswprint(tmpline[t0]) && ((width = WCWIDTH(tmpline[t0])) > 0)) {
 	    vsiz += width;
 	    if (isset(COMBININGCHARS) && IS_BASECHAR(tmpline[t0])) {
 		while (t0 < tmpll-1 && IS_COMBINING(tmpline[t0+1]))
-- 
1.7.2




Regards,
-- 
Daiki Ueno