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 ffc67eab40dfc841a013980a127cbe49200a5646..052923e94c910db866497350106381ade8c4d00f 100644 (file)
--- 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 f0240d244efb88713b779a35289a68f6cd5fcb5c..c6f444696a70682d53fc1db0fb281bd8a217053d 100644 (file)
--- 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,
 /**/