diff options
Diffstat (limited to 'test/safestack/pthread-cleanup.c')
| -rw-r--r-- | test/safestack/pthread-cleanup.c | 41 |
1 files changed, 32 insertions, 9 deletions
diff --git a/test/safestack/pthread-cleanup.c b/test/safestack/pthread-cleanup.c index 805366c9f..55c5b42dc 100644 --- a/test/safestack/pthread-cleanup.c +++ b/test/safestack/pthread-cleanup.c @@ -1,7 +1,9 @@ // RUN: %clang_safestack %s -pthread -o %t -// RUN: not --crash %run %t +// RUN: %run %t 0 +// RUN: not --crash %run %t 1 -// Test that unsafe stacks are deallocated correctly on thread exit. +// Test unsafe stack deallocation. Unsafe stacks are not deallocated immediately +// at thread exit. They are deallocated by following exiting threads. #include <stdlib.h> #include <string.h> @@ -9,7 +11,7 @@ enum { kBufferSize = (1 << 15) }; -void *t1_start(void *ptr) +void *start(void *ptr) { char buffer[kBufferSize]; return buffer; @@ -17,15 +19,36 @@ void *t1_start(void *ptr) int main(int argc, char **argv) { - pthread_t t1; - char *buffer = NULL; + int arg = atoi(argv[1]); - if (pthread_create(&t1, NULL, t1_start, NULL)) + pthread_t t1, t2; + char *t1_buffer = NULL; + + if (pthread_create(&t1, NULL, start, NULL)) abort(); - if (pthread_join(t1, &buffer)) + if (pthread_join(t1, &t1_buffer)) abort(); - // should segfault here - memset(buffer, 0, kBufferSize); + // Stack has not yet been deallocated + memset(t1_buffer, 0, kBufferSize); + + if (arg == 0) + return 0; + + for (int i = 0; i < 3; i++) { + if (pthread_create(&t2, NULL, start, NULL)) + abort(); + // Second thread destructor cleans up the first thread's stack. + if (pthread_join(t2, NULL)) + abort(); + + // Should segfault here + memset(t1_buffer, 0, kBufferSize); + + // PR39001: Re-try in the rare case that pthread_join() returns before the + // thread finishes exiting in the kernel--hence the tgkill() check for t1 + // returns that it's alive despite pthread_join() returning. + sleep(1); + } return 0; } |