| commit | 27c6ada3ada55b110ea8f40cc5a8a4b235b61781 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Fri Mar 08 21:25:53 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Mar 08 21:25:53 2019 +0000 |
| tree | 41ad945c7814b1b728d789402943d6578d00fc21 | |
| parent | 3c40463c65a91094a2f652d6501564a47476d2e8 [diff] | |
| parent | 76dcc478d348d07fa0e74a7f4d4c1e829eaa2bb8 [diff] |
Merge "Malloc debug: fix mutex deadlock issue"
diff --git a/libc/malloc_debug/PointerData.cpp b/libc/malloc_debug/PointerData.cpp index 5542c1e..6c7d8fa 100644 --- a/libc/malloc_debug/PointerData.cpp +++ b/libc/malloc_debug/PointerData.cpp
@@ -601,9 +601,9 @@ } void PointerData::PrepareFork() NO_THREAD_SAFETY_ANALYSIS { + free_pointer_mutex_.lock(); pointer_mutex_.lock(); frame_mutex_.lock(); - free_pointer_mutex_.lock(); } void PointerData::PostForkParent() NO_THREAD_SAFETY_ANALYSIS {