replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Temporary fix for http://code.google.com/p/address-sanitizer/issues/detail?id=99: 

when trying to free memory that actually belongs to the system purgeable zone, use malloc_zone_free(malloc_default_purgeable_zone(), ptr) instead of asan_free().

llvm-svn: 161661
This commit is contained in:
Alexander Potapenko 2012-08-10 11:33:01 +00:00
parent 42cf26883e
commit 2cdd4f165e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler-rt/lib/asan/asan_malloc_mac.cc
View File

@ -161,7 +161,15 @@ void ALWAYS_INLINE free_common(void *context, void *ptr) {
if (!ptr) return;
if (!flags()->mac_ignore_invalid_free || asan_mz_size(ptr)) {
GET_STACK_TRACE_HERE_FOR_FREE(ptr);
asan_free(ptr, &stack);
malloc_zone_t *zone_ptr = malloc_zone_from_ptr(ptr);
if (zone_ptr == system_purgeable_zone) {
// Allocations from malloc_default_purgeable_zone() done before
// __asan_init() may be occasionally freed via free_common().
// See http://code.google.com/p/address-sanitizer/issues/detail?id=99.
malloc_zone_free(zone_ptr, ptr);
} else {
asan_free(ptr, &stack);
}
} else {
// Let us just leak this memory for now.
GET_STACK_TRACE_HERE_FOR_FREE(ptr);