From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 2 Oct 2020 16:11:56 +0000 (+0200)
Subject: patch 8.2.1785: compiler warning for strcp() out of bounds
X-Git-Tag: v8.2.1785
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f974ff45e0ea4b85fea7d8768f005d8a2c7941e;p=vim

patch 8.2.1785: compiler warning for strcp() out of bounds

Problem:    Compiler warning for strcp() out of bounds. (Christian Brabandt)
Solution:   use memmove() instead.
---

diff --git a/src/dict.c b/src/dict.c
index 05281cb70..5725140df 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -236,11 +236,12 @@ dictitem_alloc(char_u *key)
 dictitem_copy(dictitem_T *org)
 {
     dictitem_T *di;
+    size_t	len = STRLEN(org->di_key);
 
-    di = alloc(offsetof(dictitem_T, di_key) + STRLEN(org->di_key) + 1);
+    di = alloc(offsetof(dictitem_T, di_key) + len + 1);
     if (di != NULL)
     {
-	STRCPY(di->di_key, org->di_key);
+	mch_memmove(di->di_key, org->di_key, len + 1);
 	di->di_flags = DI_FLAGS_ALLOC;
 	copy_tv(&org->di_tv, &di->di_tv);
     }
diff --git a/src/version.c b/src/version.c
index 31e835902..8f0fac9b8 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 */
+/**/
+    1785,
 /**/
     1784,
 /**/