RepoMirrors/gperftools
1
0
Fork 0
mirror of https://github.com/gperftools/gperftools synced 2025-01-03 13:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[windows] patch _free_base as well

Browse Source 
Looks like _free_base is used as generic free/delete, which is not
checked for free/delete mismatch by their debug runtime. Issue #817
occurs because something that is allocated by regular allocation
functions (new or malloc) is freed by _free_base. Patch it as well fixes
the problem.

Closes #817.
This commit is contained in:
Aliaksey Kandratsenka 2016-09-24 18:56:22 -07:00
parent acac6af26b
commit c07a15cff4
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/windows/patch_functions.cc
View File

@ -193,7 +193,7 @@ class LibcInfo {
// These are windows-only functions from malloc.h
k_Msize, k_Expand,
// A MS CRT "internal" function, implemented using _calloc_impl
k_CallocCrt,
k_CallocCrt, kFreeBase,
kNumFunctions
};
@ -276,6 +276,7 @@ template<int> class LibcInfoWithPatchFunctions : public LibcInfo {
static void* Perftools_malloc(size_t size) __THROW;
static void Perftools_free(void* ptr) __THROW;
static void Perftools_free_base(void* ptr) __THROW;
static void* Perftools_realloc(void* ptr, size_t size) __THROW;
static void* Perftools_calloc(size_t nmemb, size_t size) __THROW;
static void* Perftools_new(size_t size);
@ -417,7 +418,7 @@ const char* const LibcInfo::function_name_[] = {
NULL, // kMangledNewArrayNothrow,
NULL, // kMangledDeleteNothrow,
NULL, // kMangledDeleteArrayNothrow,
"_msize", "_expand", "_calloc_crt",
"_msize", "_expand", "_calloc_crt", "_free_base"
};
// For mingw, I can't patch the new/delete here, because the
@ -449,6 +450,7 @@ const GenericFnPtr LibcInfo::static_fn_[] = {
(GenericFnPtr)&::_msize,
(GenericFnPtr)&::_expand,
(GenericFnPtr)&::calloc,
(GenericFnPtr)&::free
};
template<int T> GenericFnPtr LibcInfoWithPatchFunctions<T>::origstub_fn_[] = {
@ -472,6 +474,7 @@ const GenericFnPtr LibcInfoWithPatchFunctions<T>::perftools_fn_[] = {
(GenericFnPtr)&Perftools__msize,
(GenericFnPtr)&Perftools__expand,
(GenericFnPtr)&Perftools_calloc,
(GenericFnPtr)&Perftools_free_base
};
/*static*/ WindowsInfo::FunctionInfo WindowsInfo::function_info_[] = {
@ -817,6 +820,16 @@ void LibcInfoWithPatchFunctions<T>::Perftools_free(void* ptr) __THROW {
do_free_with_callback(ptr, (void (*)(void*))origstub_fn_[kFree], false, 0);
}
template<int T>
void LibcInfoWithPatchFunctions<T>::Perftools_free_base(void* ptr) __THROW{
MallocHook::InvokeDeleteHook(ptr);
// This calls the windows free if do_free decides ptr was not
// allocated by tcmalloc. Note it calls the origstub_free from
// *this* templatized instance of LibcInfo. See "template
// trickiness" above.
do_free_with_callback(ptr, (void(*)(void*))origstub_fn_[kFreeBase], false, 0);
}
template<int T>
void* LibcInfoWithPatchFunctions<T>::Perftools_realloc(
void* old_ptr, size_t new_size) __THROW {