From 2aa21dc3286c605c3524bd4887614441db116296 Mon Sep 17 00:00:00 2001 From: Tatsuya Kinoshita Date: Thu, 15 Dec 2016 22:42:12 +0900 Subject: Revert "Prevent overflow beyond the end of string in proc_mchar()" This reverts commit e79d0ec2a00369a6af24007a1f2bb5e876e2c847. --- file.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'file.c') diff --git a/file.c b/file.c index efee0c6..7d227da 100644 --- a/file.c +++ b/file.c @@ -2603,20 +2603,19 @@ static void proc_mchar(struct readbuffer *obuf, int pre_mode, int width, char **str, Lineprop mode) { - int len, slen; + size_t len; check_breakpoint(obuf, pre_mode, *str); obuf->pos += width; - len = get_mclen(*str); - slen = (int)strlen(*str); - if (len > slen && slen > 0) - len = slen; - Strcat_charp_n(obuf->line, *str, len); + Strcat_charp_n(obuf->line, *str, get_mclen(*str)); if (width > 0) { set_prevchar(obuf->prevchar, *str, 1); if (**str != ' ') obuf->prev_ctype = mode; } + len = get_mclen(*str); + if (len > strlen(*str)) + len = strlen(*str); (*str) += len; obuf->flag |= RB_NFLUSHED; } -- cgit v1.2.3