RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

express: Fix track-memory-usage with DeletedBufferChain off 

mark_pointer gets called twice, which is now legal
This commit is contained in:
rdb 2025-09-04 13:32:10 +02:00
parent 212ad7486c
commit 557ce7a841
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
panda/src/express/memoryUsage.cxx
View File

@ -826,7 +826,8 @@ ns_record_void_pointer(void *ptr, size_t size) {
if (_track_memory_usage) {
if (express_cat.is_spam()) {
express_cat.spam()
<< "Recording void pointer " << (void *)ptr << "\n";
<< "Recording void pointer " << (void *)ptr
<< " with size " << size << "\n";
}
// We have to protect modifications to the table from recursive calls by
@ -846,11 +847,15 @@ ns_record_void_pointer(void *ptr, size_t size) {
MemoryInfo *info = (*insert_result.first).second;
// We shouldn't already have a void pointer.
// If we already have a void pointer, that's okay, as long as the size
// matches.
if (info->_void_ptr != nullptr) {
express_cat.error()
<< "Void pointer " << (void *)ptr << " recorded twice!\n";
nassertv(false);
if (info->_size != size) {
express_cat.error()
<< "Void pointer " << (void *)ptr
<< " was already recorded with size " << size << "!\n";
nassertv(false);
}
}
if (info->_freeze_index == _freeze_index) {