commit ee88e76f14111ea94745d7eec6caca9ffb526f1a
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 18 20:37:24 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 18 20:37:24 2018 +0000
tree 95f42eabe02a6ef3a1d660597c6f9955d473494f
parent 62cb3973832a1b4b11816562c61bd84c28864ec6
parent 52d4c3a53e1e3d1ca3a32f329659da852564a638

Merge "Deprecate set_seccomp_filter"

libc/malloc_debug/DebugData.cpp

diff --git a/libc/malloc_debug/DebugData.cpp b/libc/malloc_debug/DebugData.cpp
index d6ca998..76f8fbb 100644
--- a/libc/malloc_debug/DebugData.cpp
+++ b/libc/malloc_debug/DebugData.cpp
@@ -94,16 +94,25 @@
   if (track != nullptr) {
     track->PrepareFork();
   }
+  if (free_track != nullptr) {
+    free_track->PrepareFork();
+  }
 }
 
 void DebugData::PostForkParent() {
   if (track != nullptr) {
     track->PostForkParent();
   }
+  if (free_track != nullptr) {
+    free_track->PostForkParent();
+  }
 }
 
 void DebugData::PostForkChild() {
   if (track != nullptr) {
     track->PostForkChild();
   }
+  if (free_track != nullptr) {
+    free_track->PostForkChild();
+  }
 }

libc/malloc_debug/FreeTrackData.h

diff --git a/libc/malloc_debug/FreeTrackData.h b/libc/malloc_debug/FreeTrackData.h
index 1758ef5..0e8c177 100644
--- a/libc/malloc_debug/FreeTrackData.h
+++ b/libc/malloc_debug/FreeTrackData.h
@@ -57,6 +57,12 @@
 
   void LogBacktrace(const Header* header);
 
+  void PrepareFork() { pthread_mutex_lock(&mutex_); }
+
+  void PostForkParent() { pthread_mutex_unlock(&mutex_); }
+
+  void PostForkChild() { pthread_mutex_init(&mutex_, NULL); }
+
  private:
   void LogFreeError(const Header* header, const uint8_t* pointer);
   void VerifyAndFree(const Header* header);