|
@@ -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;
|
|
|
}
|