[asan] fix a leak in tds (https://code.google.com/p/address-sanitizer/issues/detail?id=233)
llvm-svn: 194572
This commit is contained in:
parent
6192c93a53
commit
04a1767a2e
|
@ -99,6 +99,8 @@ void AsanThread::Destroy() {
|
|||
Report("T%d exited\n", tid());
|
||||
}
|
||||
|
||||
malloc_storage().CommitBack();
|
||||
if (flags()->use_sigaltstack) UnsetAlternateSignalStack();
|
||||
asanThreadRegistry().FinishThread(tid());
|
||||
FlushToDeadThreadStats(&stats_);
|
||||
// We also clear the shadow on thread destruction because
|
||||
|
@ -165,8 +167,6 @@ thread_return_t AsanThread::ThreadStart(uptr os_id) {
|
|||
}
|
||||
|
||||
thread_return_t res = start_routine_(arg_);
|
||||
malloc_storage().CommitBack();
|
||||
if (flags()->use_sigaltstack) UnsetAlternateSignalStack();
|
||||
|
||||
// On POSIX systems we defer this to the TSD destructor. LSan will consider
|
||||
// the thread's memory as non-live from the moment we call Destroy(), even
|
||||
|
|
|
@ -0,0 +1,39 @@
|
|||
// Regression test for a leak in tsd:
|
||||
// https://code.google.com/p/address-sanitizer/issues/detail?id=233
|
||||
// RUN: %clangxx_asan -O1 %s -o %t
|
||||
// RUN: ASAN_OPTIONS=quarantine_size=1 %t
|
||||
#include <pthread.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
|
||||
extern "C" size_t __asan_get_heap_size();
|
||||
static pthread_key_t tsd_key;
|
||||
|
||||
void *Thread(void *) {
|
||||
pthread_setspecific(tsd_key, malloc(10));
|
||||
return 0;
|
||||
}
|
||||
|
||||
static volatile void *v;
|
||||
|
||||
void Dtor(void *tsd) {
|
||||
v = malloc(10000);
|
||||
free(tsd);
|
||||
free((void*)v); // The bug was that this was leaking.
|
||||
}
|
||||
|
||||
int main() {
|
||||
assert(0 == pthread_key_create(&tsd_key, Dtor));
|
||||
size_t old_heap_size = 0;
|
||||
for (int i = 0; i < 10; i++) {
|
||||
pthread_t t;
|
||||
pthread_create(&t, 0, Thread, 0);
|
||||
pthread_join(t, 0);
|
||||
size_t new_heap_size = __asan_get_heap_size();
|
||||
fprintf(stderr, "heap size: new: %zd old: %zd\n", new_heap_size, old_heap_size);
|
||||
if (old_heap_size)
|
||||
assert(old_heap_size == new_heap_size);
|
||||
old_heap_size = new_heap_size;
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue