pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix use-after-pthread_exit in a test."

This commit is contained in:
Treehugger Robot 2019-02-06 16:42:47 +00:00 committed by Gerrit Code Review
parent 9a5c0fc9d3 352853a535
commit 3f8bdb216c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/pthread_test.cpp
View File

@ -337,11 +337,14 @@ struct TestBug37410 {
static void* thread_fn(void* arg) { static void* thread_fn(void* arg) {
TestBug37410* data = reinterpret_cast<TestBug37410*>(arg); TestBug37410* data = reinterpret_cast<TestBug37410*>(arg);
// Unlocking data->mutex will cause the main thread to exit, invalidating *data. Save the handle.
pthread_t main_thread = data->main_thread;
// Let the main thread know we're running. // Let the main thread know we're running.
pthread_mutex_unlock(&data->mutex); pthread_mutex_unlock(&data->mutex);
// And wait for the main thread to exit. // And wait for the main thread to exit.
pthread_join(data->main_thread, nullptr); pthread_join(main_thread, nullptr);
return nullptr; return nullptr;
} }