blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

readfile: free & reallocate arrays in oldnewmap_clear 

Even though the size of the map was set back to DEFAULT_SIZE_EXP,
the underlying arrays were left unchained. In some cases this caused
further expansions to result in an unusual reallocation pattern
where MEM_reallocN would run expand the entries into an array
that was in fact the same size.
This commit is contained in:
Campbell Barton 2022-02-20 21:28:58 +11:00
parent e93a8c4f74
commit 2554ef986a
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/blenloader/intern/readfile.c
View File

@ -320,15 +320,22 @@ static void oldnewmap_increase_size(OldNewMap *onm)
/* Public OldNewMap API */
static OldNewMap *oldnewmap_new(void)
static void oldnewmap_init_data(OldNewMap *onm, const int capacity_exp)
{
OldNewMap *onm = MEM_callocN(sizeof(*onm), "OldNewMap");
memset(onm, 0x0, sizeof(*onm));
onm->capacity_exp = DEFAULT_SIZE_EXP;
onm->capacity_exp = capacity_exp;
onm->entries = MEM_malloc_arrayN(
ENTRIES_CAPACITY(onm), sizeof(*onm->entries), "OldNewMap.entries");
onm->map = MEM_malloc_arrayN(MAP_CAPACITY(onm), sizeof(*onm->map), "OldNewMap.map");
oldnewmap_clear_map(onm);
}
static OldNewMap *oldnewmap_new(void)
{
OldNewMap *onm = MEM_mallocN(sizeof(*onm), "OldNewMap");
oldnewmap_init_data(onm, DEFAULT_SIZE_EXP);
return onm;
}
@ -395,9 +402,10 @@ static void oldnewmap_clear(OldNewMap *onm)
}
}
onm->capacity_exp = DEFAULT_SIZE_EXP;
oldnewmap_clear_map(onm);
onm->nentries = 0;
MEM_freeN(onm->entries);
MEM_freeN(onm->map);
oldnewmap_init_data(onm, DEFAULT_SIZE_EXP);
}
static void oldnewmap_free(OldNewMap *onm)