From caf5e921210eb893a95e674b7477d13cc9a34d39 Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Fri, 4 Jan 2019 19:31:52 -0500 Subject: [PATCH] Fixed out of bounds axis name access --- main/input_default.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/main/input_default.cpp b/main/input_default.cpp index 2b7bc3f671b..18b4649f4db 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -1084,7 +1084,7 @@ Array InputDefault::get_connected_joypads() { return ret; } -static const char *_buttons[] = { +static const char *_buttons[JOY_BUTTON_MAX] = { "Face Button Bottom", "Face Button Right", "Face Button Left", @@ -1103,7 +1103,7 @@ static const char *_buttons[] = { "DPAD Right" }; -static const char *_axes[] = { +static const char *_axes[JOY_AXIS_MAX] = { "Left Stick X", "Left Stick Y", "Right Stick X", @@ -1111,7 +1111,9 @@ static const char *_axes[] = { "", "", "L2", - "R2" + "R2", + "", + "" }; String InputDefault::get_joy_button_string(int p_button) {