diff options
| author | Kuba Brecka <kuba.brecka@gmail.com> | 2016-04-14 09:05:19 +0000 |
|---|---|---|
| committer | Kuba Brecka <kuba.brecka@gmail.com> | 2016-04-14 09:05:19 +0000 |
| commit | 173c690a618287d06fe7f29175675af12dbe3a6a (patch) | |
| tree | b93fb0ac8fe2803234dcc1f0dd66ef7144608837 /compiler-rt/lib/tsan | |
| parent | 7aab6488310361f87e884d030aaa982ce825f957 (diff) | |
| download | bcm5719-llvm-173c690a618287d06fe7f29175675af12dbe3a6a.tar.gz bcm5719-llvm-173c690a618287d06fe7f29175675af12dbe3a6a.zip | |
[tsan] Fix size reporting for OS X zone allocator with 0-sized allocations
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
Diffstat (limited to 'compiler-rt/lib/tsan')
| -rw-r--r-- | compiler-rt/lib/tsan/rtl/tsan_malloc_mac.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler-rt/lib/tsan/rtl/tsan_malloc_mac.cc b/compiler-rt/lib/tsan/rtl/tsan_malloc_mac.cc index 7fd94273c31..1366384f723 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_malloc_mac.cc +++ b/compiler-rt/lib/tsan/rtl/tsan_malloc_mac.cc @@ -53,7 +53,8 @@ using namespace __tsan; SCOPED_INTERCEPTOR_RAW(free, ptr); \ user_free(thr, pc, ptr) #define COMMON_MALLOC_SIZE(ptr) \ - uptr size = user_alloc_usable_size(ptr); + uptr size = user_alloc_usable_size(ptr); \ + if (size == 0) size = 1; #define COMMON_MALLOC_FILL_STATS(zone, stats) #define COMMON_MALLOC_REPORT_UNKNOWN_REALLOC(ptr, zone_ptr, zone_name) \ (void)zone_name; \ |
