We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Adjust check in Joystick functions when checking against number of Buttons/Axes/Hats/Balls

sdl-joystick-check.diff (text/plain), 1.48 KB, created by Jools Wills on 2019-12-10 03:33:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jools Wills

Created: 2019-12-10 03:33:28 UTC

Size: 1.48 KB

patch

obsolete

>diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
>index 08bb15982..86760c326 100644
>--- a/src/joystick/SDL_joystick.c
>+++ b/src/joystick/SDL_joystick.c
>@@ -464,7 +464,7 @@ SDL_JoystickGetAxis(SDL_Joystick * joystick, int axis)
>     if (!SDL_PrivateJoystickValid(joystick)) {
>         return 0;
>     }
>-    if (axis < joystick->naxes) {
>+    if ((axis + 1 ) < joystick->naxes) {
>         state = joystick->axes[axis].value;
>     } else {
>         SDL_SetError("Joystick only has %d axes", joystick->naxes);
>@@ -503,7 +503,7 @@ SDL_JoystickGetHat(SDL_Joystick * joystick, int hat)
>     if (!SDL_PrivateJoystickValid(joystick)) {
>         return 0;
>     }
>-    if (hat < joystick->nhats) {
>+    if ((hat + 1 ) < joystick->nhats) {
>         state = joystick->hats[hat];
>     } else {
>         SDL_SetError("Joystick only has %d hats", joystick->nhats);
>@@ -525,7 +525,7 @@ SDL_JoystickGetBall(SDL_Joystick * joystick, int ball, int *dx, int *dy)
>     }
> 
>     retval = 0;
>-    if (ball < joystick->nballs) {
>+    if ((ball + 1) < joystick->nballs) {
>         if (dx) {
>             *dx = joystick->balls[ball].dx;
>         }
>@@ -551,7 +551,7 @@ SDL_JoystickGetButton(SDL_Joystick * joystick, int button)
>     if (!SDL_PrivateJoystickValid(joystick)) {
>         return 0;
>     }
>-    if (button < joystick->nbuttons) {
>+    if ((button + 1 ) < joystick->nbuttons) {
>         state = joystick->buttons[button];
>     } else {
>         SDL_SetError("Joystick only has %d buttons", joystick->nbuttons);

Actions: View | Diff

Attachments on bug 4894: 4094

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.