From 8dbca8d665bb4c4e96916b6317816381806bbc04 Mon Sep 17 00:00:00 2001
From: "sprang@webrtc.org"
 <sprang@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Fri, 20 Dec 2013 11:36:03 +0000
Subject: [PATCH] Race condition in ViECapturer::RegisterObserver

Critical section ViECapturer.observer_cs_ should be taken when
registering an observer.

BUG=2734
R=mflodman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/5999004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5326 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 webrtc/video_engine/vie_capturer.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webrtc/video_engine/vie_capturer.cc b/webrtc/video_engine/vie_capturer.cc
index aec5b39a1d..6ec5653c2e 100644
--- a/webrtc/video_engine/vie_capturer.cc
+++ b/webrtc/video_engine/vie_capturer.cc
@@ -638,6 +638,7 @@ bool ViECapturer::CaptureCapabilityFixed() {
 }
 
 int32_t ViECapturer::RegisterObserver(ViECaptureObserver* observer) {
+  CriticalSectionScoped cs(observer_cs_.get());
   if (observer_) {
     WEBRTC_TRACE(kTraceError, kTraceVideo, ViEId(engine_id_, capture_id_),
                  "%s Observer already registered", __FUNCTION__, capture_id_);