summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/dict.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/dict.c b/src/dict.c
index f2989fff21..b49005ab4f 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -222,11 +222,12 @@ dict_free_items(int copyID)
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;
diff --git a/src/version.c b/src/version.c
index 072e88431b..87ec33c607 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 */
/**/
+ 3875,
+/**/
3874,
/**/
3873,