Commit 50cb8e0f04d3a6622c19fe77eb4dd5b8187ae1ef
2020-04-07T10:13:08
Fixed deadlock in new raw input joystick code The appropriate locking is done elsewhere, this prevents inverted lock acquisition
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58
diff --git a/src/joystick/windows/SDL_rawinputjoystick.c b/src/joystick/windows/SDL_rawinputjoystick.c
index 8b5298d..6dc0da2 100644
--- a/src/joystick/windows/SDL_rawinputjoystick.c
+++ b/src/joystick/windows/SDL_rawinputjoystick.c
@@ -36,7 +36,6 @@
#include "SDL_assert.h"
#include "SDL_endian.h"
#include "SDL_hints.h"
-#include "SDL_mutex.h"
#include "../SDL_sysjoystick.h"
#include "../../core/windows/SDL_windows.h"
#include "../hidapi/SDL_hidapijoystick_c.h"
@@ -117,7 +116,6 @@ struct joystick_hwdata
{
void *reserved; /* reserving a value here to ensure the new SDL_hidapijoystick.c code never dereferences this */
SDL_RAWINPUT_Device *device;
- SDL_mutex *mutex;
};
SDL_RAWINPUT_Device *SDL_RAWINPUT_devices;
@@ -564,7 +562,6 @@ RAWINPUT_JoystickOpen(SDL_Joystick * joystick, int device_index)
hwdata->device = device;
device->joystick = joystick;
- hwdata->mutex = SDL_CreateMutex();
joystick->hwdata = hwdata;
return 0;
@@ -577,10 +574,7 @@ RAWINPUT_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Ui
SDL_RAWINPUT_Device *device = hwdata->device;
int result;
- SDL_LockMutex(hwdata->mutex);
- result = device->driver->RumbleJoystick(&device->hiddevice, joystick, low_frequency_rumble, high_frequency_rumble);
- SDL_UnlockMutex(hwdata->mutex);
- return result;
+ return device->driver->RumbleJoystick(&device->hiddevice, joystick, low_frequency_rumble, high_frequency_rumble);
}
static void
@@ -593,9 +587,7 @@ RAWINPUT_JoystickUpdate(SDL_Joystick * joystick)
hwdata = joystick->hwdata;
device = hwdata->device;
- SDL_LockMutex(hwdata->mutex);
device->driver->UpdateDevice(&device->hiddevice);
- SDL_UnlockMutex(hwdata->mutex);
}
static void
@@ -613,7 +605,6 @@ RAWINPUT_JoystickClose(SDL_Joystick * joystick)
device->joystick = NULL;
}
- SDL_DestroyMutex(hwdata->mutex);
SDL_free(hwdata);
joystick->hwdata = NULL;
}