Prechádzať zdrojové kódy

(emscripten) Add null checks for gamepad in vendor/product/xinput helpers (#15313)

navigator.getGamepads() can return null for a slot if the gamepad
disconnects between the gamepadconnected event and the proxied
MAIN_THREAD_EM_ASM_INT call. This causes a TypeError when accessing
gamepad.id. Add null guards matching the pattern already used in
EMSCRIPTEN_JoystickOpen and EMSCRIPTEN_JoystickRumble.

(cherry picked from commit 59602fb4732c8ab6f3e0a9d94d7fb8e34f1f79f8)
foxtacles 3 dní pred
rodič
commit
18463ccb8f
1 zmenil súbory, kde vykonal 9 pridanie a 1 odobranie
  1. 9 1
      src/joystick/emscripten/SDL_sysjoystick.c

+ 9 - 1
src/joystick/emscripten/SDL_sysjoystick.c

@@ -37,9 +37,11 @@ static int numjoysticks = 0;
 
 static int SDL_GetEmscriptenJoystickVendor(int device_index)
 {
-    // Let's assume that if we're calling these function then the gamepad object definitely exists
     return MAIN_THREAD_EM_ASM_INT({
         let gamepad = navigator['getGamepads']()[$0];
+        if (!gamepad) {
+            return 0;
+        }
 
         // Chrome, Edge, Opera: Wireless Controller (STANDARD GAMEPAD Vendor: 054c Product: 09cc)
         let vendor_str = 'Vendor: ';
@@ -62,6 +64,9 @@ static int SDL_GetEmscriptenJoystickProduct(int device_index)
 {
     return MAIN_THREAD_EM_ASM_INT({
         let gamepad = navigator['getGamepads']()[$0];
+        if (!gamepad) {
+            return 0;
+        }
 
         // Chrome, Edge, Opera: Wireless Controller (STANDARD GAMEPAD Vendor: 054c Product: 09cc)
         let product_str = 'Product: ';
@@ -84,6 +89,9 @@ static int SDL_IsEmscriptenJoystickXInput(int device_index)
 {
     return MAIN_THREAD_EM_ASM_INT({
         let gamepad = navigator['getGamepads']()[$0];
+        if (!gamepad) {
+            return 0;
+        }
 
         // Chrome, Edge, Opera: Xbox 360 Controller (XInput STANDARD GAMEPAD)
         // Firefox: xinput