From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 4 Jun 2021 16:33:49 +0000 (+0200)
Subject: patch 8.2.2934: ASAN error when using text from the clipboard
X-Git-Tag: v8.2.2934
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24951a67c24e75ec4ff7506f8e2e789ccd786e89;p=vim

patch 8.2.2934: ASAN error when using text from the clipboard

Problem:    ASAN error when using text from the clipboard.
Solution:   Get width of each character.
---

diff --git a/src/register.c b/src/register.c
index 8680c6bf3..8c951b7ea 100644
--- a/src/register.c
+++ b/src/register.c
@@ -2908,11 +2908,12 @@ str_to_reg(
 	{
 	    charlen = 0;
 	    for (i = start; i < len; ++i)	// find the end of the line
+	    {
 		if (str[i] == '\n')
 		    break;
+		charlen += mb_ptr2cells_len(str + i, len - i);
+	    }
 	    i -= start;			// i is now length of line
-	    if (start < len)
-		charlen = mb_charlen_len(str + start, i);
 	    if (charlen > maxlen)
 		maxlen = charlen;
 	    if (append)
@@ -2929,7 +2930,7 @@ str_to_reg(
 		mch_memmove(s, y_ptr->y_array[lnum], (size_t)extra);
 	    if (append)
 		vim_free(y_ptr->y_array[lnum]);
-	    if (i)
+	    if (i > 0)
 		mch_memmove(s + extra, str + start, (size_t)i);
 	    extra += i;
 	    s[extra] = NUL;
diff --git a/src/version.c b/src/version.c
index ab4ffeb39..eab59f42e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2934,
 /**/
     2933,
 /**/