From 7f880c9121c099d6472f0af1a5b88fbca7b3a54e Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Wed, 28 Feb 2024 11:43:22 -0800
Subject: [PATCH] Fixed crash if the controller product name is NULL
This happens when the Razer Synapse software emulates a controller with a keyboard
(cherry picked from commit 7117d545a3af7ec1dfb0d60506035b34920449ab)
---
src/joystick/SDL_joystick.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
index 4fe0b6a2591f4..102946f982b16 100644
--- a/src/joystick/SDL_joystick.c
+++ b/src/joystick/SDL_joystick.c
@@ -2495,7 +2495,7 @@ SDL_JoystickGUID SDL_CreateJoystickGUID(Uint16 bus, Uint16 vendor, Uint16 produc
*guid16++ = SDL_SwapLE16(bus);
*guid16++ = SDL_SwapLE16(crc);
- if (vendor && product) {
+ if (vendor) {
*guid16++ = SDL_SwapLE16(vendor);
*guid16++ = 0;
*guid16++ = SDL_SwapLE16(product);
@@ -2511,7 +2511,9 @@ SDL_JoystickGUID SDL_CreateJoystickGUID(Uint16 bus, Uint16 vendor, Uint16 produc
guid.data[14] = driver_signature;
guid.data[15] = driver_data;
}
- SDL_strlcpy((char *)guid16, product_name, available_space);
+ if (product_name) {
+ SDL_strlcpy((char *)guid16, product_name, available_space);
+ }
}
return guid;
}