ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #279 from Sonicadvance1/Reject-InvalidControllers 

Don't use SDL devices that report invalid ranges.
This commit is contained in:
Pierre Bourdon 2014-04-17 00:16:19 +02:00
parent 1ab8cedfce c88b83699e
commit 0908bd64dc
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
View File

@ -78,6 +78,17 @@ Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsi
} }
#endif #endif
if (SDL_JoystickNumButtons(joystick) > 255 ||
SDL_JoystickNumAxes(joystick) > 255 ||
SDL_JoystickNumHats(joystick) > 255 ||
SDL_JoystickNumBalls(joystick) > 255)
{
// This device is invalid, don't use it
// Some crazy devices(HP webcam 2100) end up as HID devices
// SDL tries parsing these as joysticks
return;
}
// get buttons // get buttons
for (u8 i = 0; i != SDL_JoystickNumButtons(m_joystick); ++i) for (u8 i = 0; i != SDL_JoystickNumButtons(m_joystick); ++i)
AddInput(new Button(i, m_joystick)); AddInput(new Button(i, m_joystick));