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

Added protection for GetCapabilities() failure.

Browse Source 
On GetCapabilities() failure, caps.cDestinations is left uninitialized.
Without a protection the following code runs in a random loop
in the worst case up to 0xFFFFFFFF times.
        for (destId = 0; destId < caps.cDestinations; destId++)
        {
            GetDestinationLineInfo(mixId, destId, destLine);

BUG=webrtc:4882

Review URL: https://codereview.webrtc.org/1269563002

Cr-Commit-Position: refs/heads/master@{#9663}
This commit is contained in:
dkirovbroadsoft 2015-07-30 20:51:35 -07:00 committed by Commit bot
parent 5f5f11cc8b
commit a12ba5502c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/modules/audio_device/win/audio_mixer_manager_win.cc
View File

@ -195,7 +195,9 @@ int32_t AudioMixerManager::EnumerateSpeakers()
for (mixId = 0; mixId < nDevices; mixId++)
{
// get capabilities for the specified mixer ID
GetCapabilities(mixId, caps);
if (!GetCapabilities(mixId, caps))
continue;
WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "[mixerID=%d] %s: ", mixId, WideToUTF8(caps.szPname));
// scan all avaliable destinations for this mixer
for (destId = 0; destId < caps.cDestinations; destId++)
@ -280,7 +282,9 @@ int32_t AudioMixerManager::EnumerateMicrophones()
for (mixId = 0; mixId < nDevices; mixId++)
{
// get capabilities for the specified mixer ID
GetCapabilities(mixId, caps);
if (!GetCapabilities(mixId, caps))
continue;
WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "[mixerID=%d] %s: ", mixId, WideToUTF8(caps.szPname));
// scan all avaliable destinations for this mixer
for (destId = 0; destId < caps.cDestinations; destId++)