Avoid double free in MediaCaptureDevicesDispatcher

rogerwang · rogerwang · commit e12f4973c427 · 2013-10-25T10:40:49.000+08:00
Fix e7d3a58
diff --git a/src/media/media_capture_devices_dispatcher.cc b/src/media/media_capture_devices_dispatcher.cc
@@ -165,6 +165,3 @@ MediaCaptureDevicesDispatcher::GetFirstAvailableVideoDevice() {
   return &(*video_devices.begin());
 }
 
-MediaCaptureDevicesDispatcher* MediaCaptureDevicesDispatcher::GetInstance() {
-  return Singleton<MediaCaptureDevicesDispatcher>::get();
-}
diff --git a/src/media/media_capture_devices_dispatcher.h b/src/media/media_capture_devices_dispatcher.h
@@ -33,8 +33,6 @@ class MediaCaptureDevicesDispatcher
     virtual ~Observer() {}
   };
 
-  static MediaCaptureDevicesDispatcher* GetInstance();
-
   MediaCaptureDevicesDispatcher();
   virtual ~MediaCaptureDevicesDispatcher();
 
@@ -67,7 +65,6 @@ class MediaCaptureDevicesDispatcher
   const content::MediaStreamDevice* GetFirstAvailableAudioDevice();
   const content::MediaStreamDevice* GetFirstAvailableVideoDevice();
 
-
  private:
   friend class base::RefCountedThreadSafe<MediaCaptureDevicesDispatcher>;
 
diff --git a/src/media/media_internals.cc b/src/media/media_internals.cc
@@ -125,5 +125,5 @@ MediaInternals::GetMediaCaptureDevicesDispatcher() {
 }
 
 MediaInternals::MediaInternals()
-  : media_devices_dispatcher_(MediaCaptureDevicesDispatcher::GetInstance()) {
+  : media_devices_dispatcher_(new MediaCaptureDevicesDispatcher()) {
 }
diff --git a/src/media/media_stream_devices_controller.cc b/src/media/media_stream_devices_controller.cc
@@ -115,27 +115,26 @@ const std::string& MediaStreamDevicesController::GetSecurityOriginSpec() const {
 void MediaStreamDevicesController::Accept(bool update_content_setting) {
   // Get the default devices for the request.
   content::MediaStreamDevices devices;
+  MediaCaptureDevicesDispatcher* dispatcher =
+      MediaInternals::GetInstance()->GetMediaCaptureDevicesDispatcher();
   switch (request_.request_type) {
   case content::MEDIA_OPEN_DEVICE: {
     const content::MediaStreamDevice* device = NULL;
     // For open device request pick the desired device or fall back to the
     // first available of the given type.
     if (request_.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE) {
-      device = MediaCaptureDevicesDispatcher::GetInstance()->
+      device = dispatcher->
         GetRequestedAudioDevice(request_.requested_audio_device_id);
       // TODO(wjia): Confirm this is the intended behavior.
       if (!device) {
-        device = MediaCaptureDevicesDispatcher::GetInstance()->
-          GetFirstAvailableAudioDevice();
+        device = dispatcher->GetFirstAvailableAudioDevice();
       }
     } else if (request_.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE) {
       // Pepper API opens only one device at a time.
-      device = MediaCaptureDevicesDispatcher::GetInstance()->
-        GetRequestedVideoDevice(request_.requested_video_device_id);
+      device = dispatcher->GetRequestedVideoDevice(request_.requested_video_device_id);
       // TODO(wjia): Confirm this is the intended behavior.
       if (!device) {
-        device = MediaCaptureDevicesDispatcher::GetInstance()->
-          GetFirstAvailableVideoDevice();
+        device = dispatcher->GetFirstAvailableVideoDevice();
       }
     }
     if (device)
@@ -148,17 +147,15 @@ void MediaStreamDevicesController::Accept(bool update_content_setting) {
       // Get the exact audio or video device if an id is specified.
       if (!request_.requested_audio_device_id.empty()) {
         const content::MediaStreamDevice* audio_device =
-          MediaCaptureDevicesDispatcher::GetInstance()->
-          GetRequestedAudioDevice(request_.requested_audio_device_id);
+          dispatcher->GetRequestedAudioDevice(request_.requested_audio_device_id);
         if (audio_device) {
           devices.push_back(*audio_device);
           needs_audio_device = false;
         }
       }
       if (!request_.requested_video_device_id.empty()) {
         const content::MediaStreamDevice* video_device =
-          MediaCaptureDevicesDispatcher::GetInstance()->
-          GetRequestedVideoDevice(request_.requested_video_device_id);
+          dispatcher->GetRequestedVideoDevice(request_.requested_video_device_id);
         if (video_device) {
           devices.push_back(*video_device);
           needs_video_device = false;

Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,3 @@ MediaCaptureDevicesDispatcher::GetFirstAvailableVideoDevice() {`
`165`	`165`	`return &(*video_devices.begin());`
`166`	`166`	`}`
`167`	`167`
`168`		`-MediaCaptureDevicesDispatcher* MediaCaptureDevicesDispatcher::GetInstance() {`
`169`		`- return Singleton<MediaCaptureDevicesDispatcher>::get();`
`170`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -125,5 +125,5 @@ MediaInternals::GetMediaCaptureDevicesDispatcher() {`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`MediaInternals::MediaInternals()`
`128`		`- : media_devices_dispatcher_(MediaCaptureDevicesDispatcher::GetInstance()) {`
	`128`	`+ : media_devices_dispatcher_(new MediaCaptureDevicesDispatcher()) {`
`129`	`129`	`}`