griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix (unreported) invalid crash in debug, disabled-by-default code.

Browse Source 
Code printing memory usage of Main ID namemaps could try to run on
nullptr.
This commit is contained in:
Bastien Montagne
2025-02-25 20:53:42 +01:00
parent 778b1efd84
commit 6b6e6a2cd1
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/blenkernel/intern/main_namemap.cc
View File

@@ -185,14 +185,17 @@ UniqueName_Map *BKE_main_namemap_create()
void BKE_main_namemap_destroy(UniqueName_Map **r_name_map)
{
#ifdef DEBUG_PRINT_MEMORY_USAGE
int64_t size_sets = 0;
int64_t size_maps = 0;
for (const UniqueName_TypeMap &type_map : (*r_name_map)->type_maps) {
size_sets += type_map.full_names.size_in_bytes();
size_maps += type_map.base_name_to_num_suffix.size_in_bytes();
if (*r_name_map) {
int64_t size_sets = 0;
int64_t size_maps = 0;
for (const UniqueName_TypeMap &type_map : (*r_name_map)->type_maps) {
size_sets += type_map.full_names.size_in_bytes();
size_maps += type_map.base_name_to_num_suffix.size_in_bytes();
}
printf("NameMap memory usage: sets %.1fKB, maps %.1fKB\n",
size_sets / 1024.0,
size_maps / 1024.0);
}
printf(
"NameMap memory usage: sets %.1fKB, maps %.1fKB\n", size_sets / 1024.0, size_maps / 1024.0);
#endif
MEM_delete<UniqueName_Map>(*r_name_map);
*r_name_map = nullptr;