encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 2205 - SDL_GetAudioDeviceName returns default-device name on invalid index for default-device only drivers 

norfanin

The audio_enumerateAndNameAudioDevicesNegativeTests test in testautomation_audio.c reports a failure for SDL_GetAudioDeviceName when called on a driver that has only the default device. SDL_GetNumAudioDevices reports 1, but SDL_GetAudioDeviceName does not check if the index passed by the caller is in that range in this case. For positive numbers anyway.

This can be reproduced with the dummy driver on Windows and Linux.
This commit is contained in:
Sam Lantinga 2013-11-03 11:13:06 -08:00
parent aaa4165b9f
commit 517886a7f1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/audio/SDL_audio.c
View File

@ -722,10 +722,16 @@ SDL_GetAudioDeviceName(int index, int iscapture)
} }
if ((iscapture) && (current_audio.impl.OnlyHasDefaultInputDevice)) { if ((iscapture) && (current_audio.impl.OnlyHasDefaultInputDevice)) {
if (index > 0) {
goto no_such_device;
}
return DEFAULT_INPUT_DEVNAME; return DEFAULT_INPUT_DEVNAME;
} }
if ((!iscapture) && (current_audio.impl.OnlyHasDefaultOutputDevice)) { if ((!iscapture) && (current_audio.impl.OnlyHasDefaultOutputDevice)) {
if (index > 0) {
goto no_such_device;
}
return DEFAULT_OUTPUT_DEVNAME; return DEFAULT_OUTPUT_DEVNAME;
} }