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 05281cb70d..5725140df3 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 31e8359029..8f0fac9b83 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1785,
+/**/
1784,
/**/
1783,