Commit: 2554ef986a8ccd1dc245478f99524dc68f8af435
Author: Campbell Barton
Date: Sun Feb 20 21:28:58 2022 +1100
Branches: master
https://developer.blender.org/rB2554ef986a8ccd1dc245478f99524dc68f8af435
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.
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 7dd35203a89..9539436cf69 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
