Commit 785d784a9308e395f1617bc14f39d5b2f3639159

Sam Lantinga 2022-09-01T22:30:05

Set the output value for ParseExtensionResponse() in all return cases

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
diff --git a/src/joystick/hidapi/SDL_hidapi_wii.c b/src/joystick/hidapi/SDL_hidapi_wii.c
index eeaa9ea..33978cd 100644
--- a/src/joystick/hidapi/SDL_hidapi_wii.c
+++ b/src/joystick/hidapi/SDL_hidapi_wii.c
@@ -259,6 +259,8 @@ static SDL_bool ParseExtensionResponse(SDL_DriverWii_Context *ctx, EWiiExtension
     Uint64 type = 0;
     int i;
 
+    *controller_type = k_eWiiExtensionControllerType_Unknown;
+
     SDL_assert(ctx->m_rgucReadBuffer[0] == k_eWiiInputReportIDs_ReadMemory);
     if (ctx->m_rgucReadBuffer[4] != 0x00 || ctx->m_rgucReadBuffer[5] != 0xFA) {
         SDL_SetError("Unexpected extension response address");
@@ -294,7 +296,6 @@ static SDL_bool ParseExtensionResponse(SDL_DriverWii_Context *ctx, EWiiExtension
         return SDL_TRUE;
     }
 
-    *controller_type = k_eWiiExtensionControllerType_Unknown;
     SDL_SetError("Unrecognized controller type: %012" SDL_PRIx64, type);
     return SDL_FALSE;
 }