From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 31 Mar 2022 20:40:33 +0000 (+0100)
Subject: patch 8.2.4659: invalid memory access when using printable function name
X-Git-Tag: v8.2.4659
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96e08e028cbcda23dccf83de6b71b3c6bf1f9d4a;p=vim

patch 8.2.4659: invalid memory access when using printable function name

Problem:    Invalid memory access when using printable function name.
Solution:   Adjust copied name length.
---

diff --git a/src/userfunc.c b/src/userfunc.c
index ffc67eab4..052923e94 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -543,7 +543,7 @@ make_ufunc_name_readable(char_u *name, char_u *buf, size_t bufsize)
     if (len + 3 > bufsize)
 	return name;
 
-    mch_memmove(buf + 5, name + 3, len + 1);
+    mch_memmove(buf + 5, name + 3, len - 2);  // Include trailing NUL
     mch_memmove(buf, "<SNR>", 5);
     return buf;
 }
diff --git a/src/version.c b/src/version.c
index f0240d244..c6f444696 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 */
+/**/
+    4659,
 /**/
     4658,
 /**/