diff options
| author | henrika@chromium.org <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-06 01:24:10 +0000 |
|---|---|---|
| committer | henrika@chromium.org <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-06 01:24:10 +0000 |
| commit | 69c13a259664a93950880e9921eb1256e697c5f7 (patch) | |
| tree | b40ce75a9767556c2283086f8d9ff2b38b33d207 /content/browser/speech/speech_recognizer_impl.cc | |
| parent | 916028b25f21820f4bbd279a0d2cbfc5e33e8f65 (diff) | |
| download | chromium_src-69c13a259664a93950880e9921eb1256e697c5f7.zip chromium_src-69c13a259664a93950880e9921eb1256e697c5f7.tar.gz chromium_src-69c13a259664a93950880e9921eb1256e697c5f7.tar.bz2 | |
Trying to solve crash in AudioInputController related to invalid EventHandler.
The AIC now NULLs out the media::AudioInputController::EventHandler in a thread safe manner to avoid any chance of accessing and invalid event handler.
BUG=363990
TEST=WebRTC and WebSpeech demo applications.
Review URL: https://codereview.chromium.org/260443002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/speech/speech_recognizer_impl.cc')
| -rw-r--r-- | content/browser/speech/speech_recognizer_impl.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/content/browser/speech/speech_recognizer_impl.cc b/content/browser/speech/speech_recognizer_impl.cc index b296cc0..3ba1f08 100644 --- a/content/browser/speech/speech_recognizer_impl.cc +++ b/content/browser/speech/speech_recognizer_impl.cc @@ -254,6 +254,7 @@ SpeechRecognizerImpl::recognition_engine() const { } SpeechRecognizerImpl::~SpeechRecognizerImpl() { + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); endpointer_.EndSession(); if (audio_controller_.get()) { audio_controller_->Close( |