commit b4168fd917e869912e0649fe13c10e5e6a595199
author Bram Moolenaar <Bram@vim.org> Wed Dec 22 20:29:09 2021 +0000
committer Bram Moolenaar <Bram@vim.org> Wed Dec 22 20:29:09 2021 +0000
tree 6f0cfb21ffa19c605c3499faa62a01519f3e49e1
parent a80aad717464760a5a50ac2201ce35b24a0cf7a5

patch 8.2.3875: gcc complains about buffer overrun

Problem:    gcc complains about buffer overrun.
Solution:   Use mch_memmove() instead of STRCPY(). (John Marriott)

src/dict.c

diff --git a/src/dict.c b/src/dict.c
index f2989ff..b49005a 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -222,11 +222,12 @@
 dictitem_alloc(char_u *key)
 {
     dictitem_T *di;
+    size_t len = STRLEN(key);
 
-    di = alloc(offsetof(dictitem_T, di_key) + STRLEN(key) + 1);
+    di = alloc(offsetof(dictitem_T, di_key) + len + 1);
     if (di != NULL)
     {
-	STRCPY(di->di_key, key);
+	mch_memmove(di->di_key, key, len + 1);
 	di->di_flags = DI_FLAGS_ALLOC;
 	di->di_tv.v_lock = 0;
 	di->di_tv.v_type = VAR_UNKNOWN;

src/version.c

diff --git a/src/version.c b/src/version.c
index 072e884..87ec33c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3875,
+/**/
     3874,
 /**/
     3873,