From 107810c145b3279bb657759587025d3b501a968c Mon Sep 17 00:00:00 2001
From: Tatsuya Kinoshita <tats@debian.org>
Date: Thu, 15 Dec 2016 22:55:23 +0900
Subject: Revert "Prevent overflow beyond the end of string in proc_mchar()"

This reverts commit 512ed467d12615f5ef40d0d28272e5662d8438ea.
---
 file.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'file.c')

diff --git a/file.c b/file.c
index 7d227da..c618ad7 100644
--- a/file.c
+++ b/file.c
@@ -2603,8 +2603,6 @@ static void
 proc_mchar(struct readbuffer *obuf, int pre_mode,
 	   int width, char **str, Lineprop mode)
 {
-    size_t len;
-
     check_breakpoint(obuf, pre_mode, *str);
     obuf->pos += width;
     Strcat_charp_n(obuf->line, *str, get_mclen(*str));
@@ -2613,10 +2611,7 @@ proc_mchar(struct readbuffer *obuf, int pre_mode,
 	if (**str != ' ')
 	    obuf->prev_ctype = mode;
     }
-    len = get_mclen(*str);
-    if (len > strlen(*str))
-	len = strlen(*str);
-    (*str) += len;
+    (*str) += get_mclen(*str);
     obuf->flag |= RB_NFLUSHED;
 }
 
-- 
cgit v1.2.3