| Index: media/base/pipeline.cc
|
| diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc
|
| index 67cc0f33ddda8be9755acf828ad007370a87f7c5..a81adc6c85fe214b69a054697cb2a6755b4eba3d 100644
|
| --- a/media/base/pipeline.cc
|
| +++ b/media/base/pipeline.cc
|
| @@ -634,8 +634,12 @@ void Pipeline::OnStopCompleted(PipelineStatus status) {
|
| error_cb_.Reset();
|
| }
|
| if (!stop_cb_.is_null()) {
|
| - base::ResetAndReturn(&stop_cb_).Run();
|
| error_cb_.Reset();
|
| + base::ResetAndReturn(&stop_cb_).Run();
|
| +
|
| + // NOTE: pipeline may be deleted at this point in time as a result of
|
| + // executing |stop_cb_|.
|
| + return;
|
| }
|
| if (!error_cb_.is_null()) {
|
| DCHECK_NE(status_, PIPELINE_OK);
|
|
|