thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.1825: allocating more memory than needed for extended structs

Browse Source 
Problem:    Allocating more memory than needed for extended structs.
Solution:   Use offsetof() instead of sizeof(). (Dominique Pelle,
            closes #4785)
This commit is contained in:
Bram Moolenaar
2019-08-07 21:42:24 +02:00
parent 5bcc5a1ff9
commit b59e735772
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dict.c
View File

@@ -210,7 +210,7 @@ dictitem_alloc(char_u *key)
{ {
dictitem_T *di; dictitem_T *di;
di = alloc(sizeof(dictitem_T) + STRLEN(key)); di = alloc(offsetof(dictitem_T, di_key) + STRLEN(key) + 1);
if (di != NULL) if (di != NULL)
{ {
STRCPY(di->di_key, key); STRCPY(di->di_key, key);
@@ -228,7 +228,7 @@ dictitem_copy(dictitem_T *org)
{ {
dictitem_T *di; 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) if (di != NULL)
{ {
STRCPY(di->di_key, org->di_key); STRCPY(di->di_key, org->di_key);

2
src/version.c
View File

@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1825,
/**/ /**/
1824, 1824,
/**/ /**/