Mercurial > vim

diff src/dict.c @ 22474:542682b758dc v8.2.1785

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1785: compiler warning for strcp() out of bounds Commit: https://github.com/vim/vim/commit/3f974ff45e0ea4b85fea7d8768f005d8a2c7941e Author: Bram Moolenaar <Bram@vim.org> Date: Fri Oct 2 18:11:56 2020 +0200 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.
author Bram Moolenaar <Bram@vim.org>
date Fri, 02 Oct 2020 18:15:15 +0200
parents 07e48ee8c3bb
children 0afa30d6dc72
line wrap: on
line diff
--- 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);
     }