Browse Source

Merge pull request #49556 from timothyqiu/joypad-button-range-check

Fix `InputEventJoypadButton::as_text` crash for invalid button index
Rémi Verschelde 4 years ago
parent
commit
b536bac28e
1 changed files with 1 additions and 1 deletions
  1. 1 1
      core/input/input_event.cpp

+ 1 - 1
core/input/input_event.cpp

@@ -1023,7 +1023,7 @@ static const char *_joy_button_descriptions[JOY_BUTTON_SDL_MAX] = {
 String InputEventJoypadButton::as_text() const {
 	String text = "Joypad Button " + itos(button_index);
 
-	if (button_index < JOY_BUTTON_SDL_MAX) {
+	if (button_index >= 0 && button_index < JOY_BUTTON_SDL_MAX) {
 		text += vformat(" (%s)", _joy_button_descriptions[button_index]);
 	}