Check buffer_pool_ for null in VideoCaptureController::PostStopping.

content/browser/renderer_host/media/video_capture_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/media/video_capture_controller.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 160 matching lines @@
   if (client) {
     pending_clients_.remove(client);
     return;
   }
 
   client = FindClient(id, event_handler, controller_clients_);
   if (!client)
     return;
 
   // Take back all buffers held by the |client|.
-  for (std::set<int>::iterator buffer_it = client->buffers.begin();
-       buffer_it != client->buffers.end(); ++buffer_it) {
-    int buffer_id = *buffer_it;
-    buffer_pool_->RelinquishConsumerHold(buffer_id, 1);
+  if (buffer_pool_) {
+    for (std::set<int>::iterator buffer_it = client->buffers.begin();
+         buffer_it != client->buffers.end(); ++buffer_it) {
+      int buffer_id = *buffer_it;
+      buffer_pool_->RelinquishConsumerHold(buffer_id, 1);
+    }
   }
   client->buffers.clear();
 
   int session_id = client->parameters.session_id;
   delete client;
   controller_clients_.remove(client);
 
   // No more clients. Stop device.
   if (controller_clients_.empty() &&
       (state_ == VIDEO_CAPTURE_STATE_STARTED ||
@@ skipping 405 matching lines @@
     PostStopping();
   }
 }
 
 void VideoCaptureController::SendFrameInfoAndBuffers(ControllerClient* client) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(frame_info_available_);
   client->event_handler->OnFrameInfo(client->controller_id,
                                      frame_info_.width, frame_info_.height,
                                      frame_info_.frame_rate);
+  if (!buffer_pool_)
+    return;
+
   for (int buffer_id = 1; buffer_id <= buffer_pool_->count(); ++buffer_id) {
     base::SharedMemoryHandle remote_handle =
         buffer_pool_->ShareToProcess(buffer_id, client->render_process_handle);
 
     client->event_handler->OnBufferCreated(client->controller_id,
                                            remote_handle,
                                            buffer_pool_->GetMemorySize(),
                                            buffer_id);
   }
 }
@@ skipping 28 matching lines @@
 
 // This function is called when all buffers have been returned to controller,
 // or when device is stopped. It decides whether the device needs to be
 // restarted.
 void VideoCaptureController::PostStopping() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK_EQ(state_, VIDEO_CAPTURE_STATE_STOPPING);
 
   // When clients still have some buffers, or device has not been stopped yet,
   // do nothing.
-  if (buffer_pool_->IsAnyBufferHeldForConsumers() || device_in_use_)
+  if ((buffer_pool_ && buffer_pool_->IsAnyBufferHeldForConsumers()) ||
+      device_in_use_)
     return;
 
   {
     base::AutoLock lock(buffer_pool_lock_);
     buffer_pool_ = NULL;
   }
 
   // No more client. Therefore the controller is stopped.
   if (controller_clients_.empty() && pending_clients_.empty()) {
     state_ = VIDEO_CAPTURE_STATE_STOPPED;
@@ skipping 20 matching lines @@
     controller_clients_.push_back((*client_it));
     pending_clients_.erase(client_it++);
   }
   // Request the manager to start the actual capture.
   video_capture_manager_->Start(current_params_, this);
   state_ = VIDEO_CAPTURE_STATE_STARTED;
   device_in_use_ = true;
 }
 
 }  // namespace content