admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Protect against NumberOfEnumeratedDevices and Get[In|Out]putDeviceNames returning inconsistent results.

Browse Source 
It's possible for an device to be counted but getting its name fails, in which case the utility function returns true but would continue from its loop filling the AudioDeviceNames vector, leading to a smaller output than the later code expects.

No-Try: True
Bug: b/144729866
Change-Id: If902cada4ef2911bc24fbec0f169da75ff6e6a83
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/160020
Commit-Queue: Henrik Andreassson <henrika@webrtc.org>
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29840}
This commit is contained in:
Tim Haloun 2019-11-19 11:04:55 -08:00 committed by Commit Bot
parent 4dd56a3830
commit 83b286202b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/audio_device/win/core_audio_base_win.cc
View File

@ -282,7 +282,7 @@ int CoreAudioBase::DeviceName(int index,
AudioDeviceNames device_names;
bool ok = IsInput() ? core_audio_utility::GetInputDeviceNames(&device_names)
: core_audio_utility::GetOutputDeviceNames(&device_names);
if (!ok) {
if (!ok || static_cast<int>(device_names.size()) <= index) {
RTC_LOG(LS_ERROR) << "Failed to get the device name";
return -1;
}