Fix hangs & crashes in teardown-during-Seek.

media/base/composite_filter.cc

 // Copyright (c) 2011 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 "media/base/composite_filter.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 155 matching lines @@
       break;
     case kSeekPending:
       ChangeState(kStopWhileSeekPending);
       break;
     default:
       SendErrorToHost(PIPELINE_ERROR_INVALID_STATE);
       stop_callback.Run();
       return;
   }
 
+  if (!status_cb_.is_null()) {
+    DCHECK_EQ(state_, kStopWhileSeekPending);
+    status_cb_.Reset();
+  }
+
   callback_ = stop_callback;
   if (state_ == kStopPending) {
     StartSerialCallSequence();
   }
 }
 
 void CompositeFilter::SetPlaybackRate(float playback_rate) {
   DCHECK_EQ(message_loop_, MessageLoop::current());
   for (FilterVector::iterator iter = filters_.begin();
        iter != filters_.end();
@@ skipping 75 matching lines @@
       filter->Flush(callback);
       break;
     case kStopPending:
       filter->Stop(callback);
       break;
     case kSeekPending:
       filter->Seek(pending_seek_time_,
                    base::Bind(&CompositeFilter::OnStatusCB, this, callback));
       break;
     default:
-
       ChangeState(kError);
       DispatchPendingCallback(PIPELINE_ERROR_INVALID_STATE);
   }
 }
 
 void CompositeFilter::DispatchPendingCallback(PipelineStatus status) {
   DCHECK(status_cb_.is_null() ^ callback_.is_null());
 
   if (!status_cb_.is_null()) {
     ResetAndRunCB(&status_cb_, status);
@@ skipping 140 matching lines @@
 
   return !callback_.is_null() || !status_cb_.is_null();
 }
 
 void CompositeFilter::OnStatusCB(const base::Closure& callback,
                                  PipelineStatus status) {
   if (status != PIPELINE_OK)
     SetError(status);
 
   callback.Run();
-
 }
 
 void CompositeFilter::SetError(PipelineStatus error) {
   // TODO(acolwell): Temporary hack to handle errors that occur
   // during filter initialization. In this case we just forward
   // the error to the host even if it is on the wrong thread. We
   // have to do this because if we defer the call, we can't be
   // sure the host will get the error before the "init done" callback
   // is executed. This will be cleaned up when filter init is refactored.
   if (state_ == kCreated) {
@@ skipping 92 matching lines @@
 
 void CompositeFilter::FilterHostImpl::SetCurrentReadPosition(int64 offset) {
   host_->SetCurrentReadPosition(offset);
 }
 
 int64 CompositeFilter::FilterHostImpl::GetCurrentReadPosition() {
   return host_->GetCurrentReadPosition();
 }
 
 }  // namespace media