commit 1d35d2971b1e89b3ecadb7fb1ff064f9af850ad4
author andresp <andresp@webrtc.org> Mon Jul 11 02:23:45 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jul 11 09:23:50 2016 +0000
tree b549263fcf3811278f5643ea07564ed69f423e64
parent c2c24f795eba0ba2a13bbd0d75f87696bd7a484b

Protect MessageQueue stop field with a critical section to avoid data races.

Review-Url: https://codereview.webrtc.org/2023193002
Cr-Commit-Position: refs/heads/master@{#13430}

webrtc/base/messagequeue.h

diff --git a/webrtc/base/messagequeue.h b/webrtc/base/messagequeue.h
index a1b20da..628ce44 100644
--- a/webrtc/base/messagequeue.h
+++ b/webrtc/base/messagequeue.h
@@ -288,7 +288,6 @@
 
   void WakeUpSocketServer();
 
-  bool fStop_;
   bool fPeekKeep_;
   Message msgPeek_;
   MessageList msgq_ GUARDED_BY(crit_);
@@ -299,6 +298,8 @@
   bool fDestroyed_;
 
  private:
+  volatile int stop_;
+
   // The SocketServer might not be owned by MessageQueue.
   SocketServer* ss_ GUARDED_BY(ss_lock_);
   // Used if SocketServer ownership lies with |this|.