commit b59e7357722d977830948572a395f0a175c7ded8
author Bram Moolenaar <Bram@vim.org> Wed Aug 07 21:42:24 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Wed Aug 07 21:42:24 2019 +0200
tree 4b67980c7e04c9986a51368b51b554cc61b9d546
parent 5bcc5a1ff94bbab1b175e35a72e3df974106b393

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)

src/dict.c

diff --git a/src/dict.c b/src/dict.c
index 45aa824..1097e58 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -210,7 +210,7 @@
 {
     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_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);

src/version.c

diff --git a/src/version.c b/src/version.c
index 53c7a9d..3bb1cfd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1825,
+/**/
     1824,
 /**/
     1823,