pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Protect the game controller API the same way the joystick API is protected from multi-threaded access

Browse source
This commit is contained in:
Sam Lantinga 2016-12-08 10:13:45 -08:00
parent 400ed31043
commit 6ece64092f
3 changed files with 43 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/joystick/SDL_joystick.c
View file

@ -37,16 +37,16 @@ static SDL_Joystick *SDL_joysticks = NULL;
static SDL_Joystick *SDL_updating_joystick = NULL;
static SDL_mutex *SDL_joystick_lock = NULL; /* This needs to support recursive locks */
static void
SDL_LockJoystickList()
void
SDL_LockJoystickList(void)
{
if (SDL_joystick_lock) {
SDL_LockMutex(SDL_joystick_lock);
}
}
static void
SDL_UnlockJoystickList()
void
SDL_UnlockJoystickList(void)
{
if (SDL_joystick_lock) {
SDL_UnlockMutex(SDL_joystick_lock);
@ -216,10 +216,10 @@ SDL_JoystickOpen(int device_index)
joystick->next = SDL_joysticks;
SDL_joysticks = joystick;
SDL_SYS_JoystickUpdate(joystick);
SDL_UnlockJoystickList();
SDL_SYS_JoystickUpdate(joystick);
return (joystick);
}
@ -787,6 +787,12 @@ SDL_JoystickUpdate(void)
SDL_LockJoystickList();
if (SDL_updating_joystick) {
/* The joysticks are already being updated */
SDL_UnlockJoystickList();
return;
}
for (joystick = SDL_joysticks; joystick; joystick = joysticknext) {
/* save off the next pointer, the Update call may cause a joystick removed event
* and cause our joystick pointer to be freed
@ -795,6 +801,9 @@ SDL_JoystickUpdate(void)
SDL_updating_joystick = joystick;
/* Make sure the list is unlocked while dispatching events to prevent application deadlocks */
SDL_UnlockJoystickList();
SDL_SYS_JoystickUpdate(joystick);
if (joystick->force_recentering) {
@ -816,6 +825,8 @@ SDL_JoystickUpdate(void)
joystick->force_recentering = SDL_FALSE;
}
SDL_LockJoystickList();
SDL_updating_joystick = NULL;
/* If the joystick was closed while updating, free it here */