diff options
| author | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-15 17:28:28 +0000 |
|---|---|---|
| committer | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-15 17:28:28 +0000 |
| commit | 4c3695724890e0de2cf361fe7264ebc8c6a97a11 (patch) | |
| tree | 7cf619cad4ce2143bbb4603058b2fbcc24a7be51 | |
| parent | 8b8b330558e1e272b03da412551ec4c4d683cf3f (diff) | |
| download | chromium_src-4c3695724890e0de2cf361fe7264ebc8c6a97a11.zip chromium_src-4c3695724890e0de2cf361fe7264ebc8c6a97a11.tar.gz chromium_src-4c3695724890e0de2cf361fe7264ebc8c6a97a11.tar.bz2 | |
Merge 213846 "Fix crash in CrasAudioHandler::GetActiveOutputDevi..."
> Fix crash in CrasAudioHandler::GetActiveOutputDevice if there are no devices
>
> BUG=263829
> TEST=manual
>
> Review URL: https://chromiumcodereview.appspot.com/20000005
TBR=spang@chromium.org
Review URL: https://codereview.chromium.org/22895010
git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@217807 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chromeos/audio/cras_audio_handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromeos/audio/cras_audio_handler.cc b/chromeos/audio/cras_audio_handler.cc index 9e1a892..ab39a55 100644 --- a/chromeos/audio/cras_audio_handler.cc +++ b/chromeos/audio/cras_audio_handler.cc @@ -171,7 +171,7 @@ void CrasAudioHandler::GetAudioDevices(AudioDeviceList* device_list) const { bool CrasAudioHandler::GetActiveOutputDevice(AudioDevice* device) const { const AudioDevice* active_device = GetDeviceFromId(active_output_node_id_); - if (!device) + if (!active_device || !device) return false; *device = *active_device; return true; |