22009: another double-width character fix

2 files changed, 11 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index f3350b6fa..8f44b794a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-21  Peter Stephenson  <pws@csr.com>
+
+	* 22009: Src/Zle/zle_refresh.c: fix for double-width characters:
+	stop when we reach the NULL at the end of the new line.
+
 2005-11-18  Wayne Davison  <wayned@users.sourceforge.net>
 
 	* users/9690: Completion/Unix/Command/_ssh: improved Hannu's
diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c
index fbf241919..bd3875e19 100644
--- a/Src/Zle/zle_refresh.c
+++ b/Src/Zle/zle_refresh.c
@@ -1201,6 +1201,12 @@ refreshline(int ln)
     /* we can't do any fancy tricks, so just dump the single character
        and keep on trying */
 #ifdef MULTIBYTE_SUPPORT
+	/*
+	 * in case we were tidying up a funny-width character when we
+	 * reached the end of the new line...
+	 */
+	if (!*nl)
+	    break;
 	do {
 #endif
 	    zputc(*nl);