maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ASan] fix a bug in allocator-v2 which could lead to SEGV on realloc(malloc(0), 4) 

llvm-svn: 173681
This commit is contained in:
Alexey Samsonov 2013-01-28 11:24:13 +00:00
parent 20b09efabb
commit 7eda134fa7
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler-rt/lib/asan/asan_allocator2.cc
View File

@ -612,7 +612,7 @@ void *asan_calloc(uptr nmemb, uptr size, StackTrace *stack) {
}
void *asan_realloc(void *p, uptr size, StackTrace *stack) {
if (p == 0)
if (p == 0 || reinterpret_cast<uptr>(p) == kReturnOnZeroMalloc)
return Allocate(size, 8, stack, FROM_MALLOC);
if (size == 0) {
Deallocate(p, stack, FROM_MALLOC);

9
compiler-rt/lib/asan/tests/asan_test.cc
View File

@ -380,6 +380,15 @@ TEST(AddressSanitizer, ReallocTest) {
(my_rand() % 1000 + kMinElem) * sizeof(int));
EXPECT_EQ(3, ptr[3]);
}
free(ptr);
// Realloc pointer returned by malloc(0).
int *ptr2 = Ident((int*)malloc(0));
fprintf(stderr, "Malloc(0): %p\n", ptr2);
ptr2 = Ident((int*)realloc(ptr2, sizeof(*ptr2)));
fprintf(stderr, "Realloc(0, 4): %p\n", ptr2);
*ptr2 = 42;
EXPECT_EQ(42, *ptr2);
free(ptr2);
}
#ifndef __APPLE__