nodejs
diff --git a/Collapse file
‎src/tracing/node_trace_writer.cc‎
Copy file name to clipboardExpand all lines: src/tracing/node_trace_writer.cc
+7-2Lines changed: 7 additions & 2 deletions b/Collapse file
‎src/tracing/node_trace_writer.cc‎
Copy file name to clipboardExpand all lines: src/tracing/node_trace_writer.cc
+7-2Lines changed: 7 additions & 2 deletions
diff --git a/Collapse file
‎src/tracing/node_trace_writer.h‎
Copy file name to clipboardExpand all lines: src/tracing/node_trace_writer.h
+3-1Lines changed: 3 additions & 1 deletion b/Collapse file
‎src/tracing/node_trace_writer.h‎
Copy file name to clipboardExpand all lines: src/tracing/node_trace_writer.h
+3-1Lines changed: 3 additions & 1 deletion
@@ -138,8 +138,13 @@ void NodeTraceWriter::FlushPrivate() {
 
 void NodeTraceWriter::Flush(bool blocking) {
   Mutex::ScopedLock scoped_lock(request_mutex_);
-  if (!json_trace_writer_) {
-    return;
+  {
+    // We need to lock the mutexes here in a nested fashion; stream_mutex_
+    // protects json_trace_writer_, and without request_mutex_ there might be
+    // a time window in which the stream state changes?
+    Mutex::ScopedLock stream_mutex_lock(stream_mutex_);
+    if (!json_trace_writer_)
+      return;
   }
   int request_id = ++num_write_requests_;
   int err = uv_async_send(&flush_signal_);
 
@@ -45,9 +45,11 @@ class NodeTraceWriter : public AsyncTraceWriter {
   // Triggers callback to close async objects, ending the tracing thread.
   uv_async_t exit_signal_;
   // Prevents concurrent R/W on state related to serialized trace data
-  // before it's written to disk, namely stream_ and total_traces_.
+  // before it's written to disk, namely stream_ and total_traces_
+  // as well as json_trace_writer_.
   Mutex stream_mutex_;
   // Prevents concurrent R/W on state related to write requests.
+  // If both mutexes are locked, request_mutex_ has to be locked first.
   Mutex request_mutex_;
   // Allows blocking calls to Flush() to wait on a condition for
   // trace events to be written to disk.