eden-emu/SDL
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More defensive coding against dangling device pointers

Browse source
This commit is contained in:
Sam Lantinga 2023-04-06 11:33:27 -07:00
parent 1a20ccb289
commit acadb6f873
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/joystick/hidapi/SDL_hidapijoystick.c
View file

@ -87,6 +87,7 @@ static SDL_SpinLock SDL_HIDAPI_spinlock;
static SDL_bool SDL_HIDAPI_hints_changed = SDL_FALSE; static SDL_bool SDL_HIDAPI_hints_changed = SDL_FALSE;
static Uint32 SDL_HIDAPI_change_count = 0; static Uint32 SDL_HIDAPI_change_count = 0;
static SDL_HIDAPI_Device *SDL_HIDAPI_devices SDL_GUARDED_BY(SDL_joystick_lock); static SDL_HIDAPI_Device *SDL_HIDAPI_devices SDL_GUARDED_BY(SDL_joystick_lock);
static char SDL_HIDAPI_device_magic;
static int SDL_HIDAPI_numjoysticks = 0; static int SDL_HIDAPI_numjoysticks = 0;
static SDL_bool SDL_HIDAPI_combine_joycons = SDL_TRUE; static SDL_bool SDL_HIDAPI_combine_joycons = SDL_TRUE;
static SDL_bool initialized = SDL_FALSE; static SDL_bool initialized = SDL_FALSE;
@ -846,6 +847,7 @@ static SDL_HIDAPI_Device *HIDAPI_AddDevice(const struct SDL_hid_device_info *inf
if (device == NULL) { if (device == NULL) {
return NULL; return NULL;
} }
device->magic = &SDL_HIDAPI_device_magic;
device->path = SDL_strdup(info->path); device->path = SDL_strdup(info->path);
if (!device->path) { if (!device->path) {
SDL_free(device); SDL_free(device);
@ -957,6 +959,7 @@ static void HIDAPI_DelDevice(SDL_HIDAPI_Device *device)
device->children[i]->parent = NULL; device->children[i]->parent = NULL;
} }
device->magic = NULL;
SDL_DestroyMutex(device->dev_lock); SDL_DestroyMutex(device->dev_lock);
SDL_free(device->serial); SDL_free(device->serial);
SDL_free(device->name); SDL_free(device->name);
@ -1432,7 +1435,7 @@ static SDL_bool HIDAPI_GetJoystickDevice(SDL_Joystick *joystick, SDL_HIDAPI_Devi
if (joystick && joystick->hwdata) { if (joystick && joystick->hwdata) {
*device = joystick->hwdata->device; *device = joystick->hwdata->device;
if (*device && (*device)->driver) { if (*device && (*device)->magic == &SDL_HIDAPI_device_magic && (*device)->driver != NULL) {
return SDL_TRUE; return SDL_TRUE;
} }
} }

1
src/joystick/hidapi/SDL_hidapijoystick_c.h
View file

@ -50,6 +50,7 @@ struct SDL_HIDAPI_DeviceDriver;
typedef struct SDL_HIDAPI_Device typedef struct SDL_HIDAPI_Device
{ {
const void *magic;
char *name; char *name;
char *path; char *path;
Uint16 vendor_id; Uint16 vendor_id;