06be295946
This commit will error (and abort if enabled) when trying to call `MEM_freeN` (and related `MEM_dupallocN`, `MEM_reallocN` and `MEM_recallocN` functions) with a pointer created the C++ way (i.e. through `MEM_new`, or the guardedalloc-overloaded `new` operator). To do so, it adds internal use only implementations for `malloc_alligned` and `free`, which take an extra parameter indicating whether they are dealing with data created/deleted the 'C++ way' (using `new`/`delete` and similar). The cpp-created data are flagged with the new `MEMHEAD_FLAG_FROM_CPP_NEW`, either in the lower two-bytes len value for lockfree allocator, or as a new flag member of the guarded allocator header data. The public `MEM_new`/`MEM_delete` template functions, and the guardedalloc-overloaded versions of `new`/`delete` operators are updated accordingly. These changes have been successfully tested both with and without `WITH_CXX_GUARDEDALLOC`. NOTE: A lot of mismatches have already been fixed in `main` before merging this change. There are likely some less easy to trigger ones still in our codebase though. Pull Request: https://projects.blender.org/blender/blender/pulls/123740
52 lines
1.2 KiB
C++
52 lines
1.2 KiB
C++
/* SPDX-FileCopyrightText: 2002-2022 Blender Authors
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup intern_mem
|
|
*/
|
|
|
|
#include <cstddef>
|
|
#include <new>
|
|
|
|
#include "../intern/mallocn_intern_function_pointers.hh"
|
|
|
|
using namespace mem_guarded::internal;
|
|
|
|
void *operator new(size_t size, const char *str);
|
|
void *operator new[](size_t size, const char *str);
|
|
|
|
/* not default but can be used when needing to set a string */
|
|
void *operator new(size_t size, const char *str)
|
|
{
|
|
return mem_mallocN_aligned_ex(size, 1, str, AllocationType::NEW_DELETE);
|
|
}
|
|
void *operator new[](size_t size, const char *str)
|
|
{
|
|
return mem_mallocN_aligned_ex(size, 1, str, AllocationType::NEW_DELETE);
|
|
}
|
|
|
|
void *operator new(size_t size)
|
|
{
|
|
return mem_mallocN_aligned_ex(size, 1, "C++/anonymous", AllocationType::NEW_DELETE);
|
|
}
|
|
void *operator new[](size_t size)
|
|
{
|
|
return mem_mallocN_aligned_ex(size, 1, "C++/anonymous[]", AllocationType::NEW_DELETE);
|
|
}
|
|
|
|
void operator delete(void *p) throw()
|
|
{
|
|
/* `delete nullptr` is valid in c++. */
|
|
if (p) {
|
|
mem_freeN_ex(p, AllocationType::NEW_DELETE);
|
|
}
|
|
}
|
|
void operator delete[](void *p) throw()
|
|
{
|
|
/* `delete nullptr` is valid in c++. */
|
|
if (p) {
|
|
mem_freeN_ex(p, AllocationType::NEW_DELETE);
|
|
}
|
|
}
|