Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[tsan] Fix size reporting for OS X zone allocator with 0-sized alloca…
…tions The custom zone implementation for OS X must not return 0 (even for 0-sized allocations). Returning 0 indicates that the pointer doesn't belong to the zone. This can break existing applications. The underlaying allocator allocates 1 byte for 0-sized allocations anyway, so returning 1 in this case is okay. Differential Revision: http://reviews.llvm.org/D19100 llvm-svn: 266283
- Loading branch information
1 parent
7aab648
commit 173c690
Showing
2 changed files
with
25 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
// Test that malloc_zone_from_ptr returns a valid zone for a 0-sized allocation. | ||
|
||
// RUN: %clang_tsan %s -o %t -framework Foundation | ||
// RUN: %run %t 2>&1 | FileCheck %s | ||
|
||
#import <Foundation/Foundation.h> | ||
#include <malloc/malloc.h> | ||
|
||
int main() { | ||
void *p = malloc(0); | ||
|
||
size_t s = malloc_size(p); | ||
printf("size = 0x%zx\n", s); | ||
|
||
malloc_zone_t *z = malloc_zone_from_ptr(p); | ||
if (z) | ||
printf("z = %p\n", z); | ||
else | ||
printf("no zone\n"); | ||
} | ||
|
||
// CHECK: z = 0x{{[0-9a-f]+}} | ||
// CHECK-NOT: no zone |