Skip to content
Permalink
Browse files

Fixed bug 2205 - SDL_GetAudioDeviceName returns default-device name o…

…n 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.
  • Loading branch information
slouken committed Nov 3, 2013
1 parent aaa4165 commit 517886a7f15886e016ee651b0fa68cae0aabc55a
Showing with 6 additions and 0 deletions.
  1. +6 −0 src/audio/SDL_audio.c
@@ -722,10 +722,16 @@ SDL_GetAudioDeviceName(int index, int iscapture)
}

if ((iscapture) && (current_audio.impl.OnlyHasDefaultInputDevice)) {
if (index > 0) {
goto no_such_device;
}
return DEFAULT_INPUT_DEVNAME;
}

if ((!iscapture) && (current_audio.impl.OnlyHasDefaultOutputDevice)) {
if (index > 0) {
goto no_such_device;
}
return DEFAULT_OUTPUT_DEVNAME;
}

0 comments on commit 517886a

Please sign in to comment.