joystick: virtual: Fix event injection for axes/hats

pcercuei · sezero · commit db5cd8c69408 · 2021-06-12T17:55:03.000+03:00
SDL_JoystickSetVirtualAxisInner() and SDL_JoystickSetVirtualHatInner()
did not properly sanitize the 'axis' and 'hat' parameters.

Signed-off-by: Paul Cercueil &lt;paul@crapouillou.net&gt;
diff --git a/src/joystick/virtual/SDL_virtualjoystick.c b/src/joystick/virtual/SDL_virtualjoystick.c
@@ -176,7 +176,7 @@ SDL_JoystickSetVirtualAxisInner(SDL_Joystick * joystick, int axis, Sint16 value)
     }
 
     hwdata = (joystick_hwdata *)joystick->hwdata;
-    if (axis < 0 || axis >= hwdata->nbuttons) {
+    if (axis < 0 || axis >= hwdata->naxes) {
         SDL_UnlockJoysticks();
         return SDL_SetError("Invalid axis index");
     }
@@ -226,7 +226,7 @@ SDL_JoystickSetVirtualHatInner(SDL_Joystick * joystick, int hat, Uint8 value)
     }
 
     hwdata = (joystick_hwdata *)joystick->hwdata;
-    if (hat < 0 || hat >= hwdata->nbuttons) {
+    if (hat < 0 || hat >= hwdata->nhats) {
         SDL_UnlockJoysticks();
         return SDL_SetError("Invalid hat index");
     }

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ SDL_JoystickSetVirtualAxisInner(SDL_Joystick * joystick, int axis, Sint16 value)`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`hwdata = (joystick_hwdata *)joystick->hwdata;`
`179`		`- if (axis < 0 \|\| axis >= hwdata->nbuttons) {`
	`179`	`+ if (axis < 0 \|\| axis >= hwdata->naxes) {`
`180`	`180`	`SDL_UnlockJoysticks();`
`181`	`181`	`return SDL_SetError("Invalid axis index");`
`182`	`182`	`}`
`@@ -226,7 +226,7 @@ SDL_JoystickSetVirtualHatInner(SDL_Joystick * joystick, int hat, Uint8 value)`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`hwdata = (joystick_hwdata *)joystick->hwdata;`
`229`		`- if (hat < 0 \|\| hat >= hwdata->nbuttons) {`
	`229`	`+ if (hat < 0 \|\| hat >= hwdata->nhats) {`
`230`	`230`	`SDL_UnlockJoysticks();`
`231`	`231`	`return SDL_SetError("Invalid hat index");`
`232`	`232`	`}`