mirror
/
SDL
mirror of https://github.com/libsdl-org/SDL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed crash if a device doesn't have a USB product or manufacturer string 

This happens with the Razer Huntsman V3 Pro Tenkeyless keyboard
This commit is contained in:
Sam Lantinga 2024-12-05 10:42:02 -08:00
parent 9f8157f42c
commit 235e5c6a6c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/joystick/hidapi/SDL_hidapijoystick.c
View File

@ -1293,7 +1293,10 @@ char *HIDAPI_GetDeviceProductName(Uint16 vendor_id, Uint16 product_id)
SDL_LockJoysticks(); SDL_LockJoysticks();
for (device = SDL_HIDAPI_devices; device; device = device->next) { for (device = SDL_HIDAPI_devices; device; device = device->next) {
if (vendor_id == device->vendor_id && product_id == device->product_id) { if (vendor_id == device->vendor_id && product_id == device->product_id) {
name = SDL_strdup(device->product_string); if (device->product_string) {
name = SDL_strdup(device->product_string);
}
break;
} }
} }
SDL_UnlockJoysticks(); SDL_UnlockJoysticks();
@ -1309,7 +1312,10 @@ char *HIDAPI_GetDeviceManufacturerName(Uint16 vendor_id, Uint16 product_id)
SDL_LockJoysticks(); SDL_LockJoysticks();
for (device = SDL_HIDAPI_devices; device; device = device->next) { for (device = SDL_HIDAPI_devices; device; device = device->next) {
if (vendor_id == device->vendor_id && product_id == device->product_id) { if (vendor_id == device->vendor_id && product_id == device->product_id) {
name = SDL_strdup(device->manufacturer_string); if (device->manufacturer_string) {
name = SDL_strdup(device->manufacturer_string);
}
break;
} }
} }
SDL_UnlockJoysticks(); SDL_UnlockJoysticks();