From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 7 Aug 2019 19:42:24 +0000 (+0200)
Subject: patch 8.1.1825: allocating more memory than needed for extended structs
X-Git-Tag: v8.1.1825
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b59e7357722d977830948572a395f0a175c7ded8;p=vim

patch 8.1.1825: allocating more memory than needed for extended structs

Problem:    Allocating more memory than needed for extended structs.
Solution:   Use offsetof() instead of sizeof(). (Dominique Pelle,
            closes #4785)
---

diff --git a/src/dict.c b/src/dict.c
index 45aa8246f..1097e58cd 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -210,7 +210,7 @@ dictitem_alloc(char_u *key)
 {
     dictitem_T *di;
 
-    di = alloc(sizeof(dictitem_T) + STRLEN(key));
+    di = alloc(offsetof(dictitem_T, di_key) + STRLEN(key) + 1);
     if (di != NULL)
     {
 	STRCPY(di->di_key, key);
@@ -228,7 +228,7 @@ dictitem_copy(dictitem_T *org)
 {
     dictitem_T *di;
 
-    di = alloc(sizeof(dictitem_T) + STRLEN(org->di_key));
+    di = alloc(offsetof(dictitem_T, di_key) + STRLEN(org->di_key) + 1);
     if (di != NULL)
     {
 	STRCPY(di->di_key, org->di_key);
diff --git a/src/version.c b/src/version.c
index 53c7a9d1b..3bb1cfd54 100644
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1825,
 /**/
     1824,
 /**/