From bcb8cc2faaacc5930c578883661ed43bca45b8c4 Mon Sep 17 00:00:00 2001 From: Marcelo Fernandez Date: Thu, 22 Jun 2017 11:52:11 -0300 Subject: [PATCH] Fix possible crash in joy_axis (fixes #4944). (cherry picked from commit 2419a4e4ffd494c3f22d9736a1fd4d67e016b474) --- main/input_default.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main/input_default.cpp b/main/input_default.cpp index 7e81aa6b94..fbf6c1deb4 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -833,6 +833,8 @@ uint32_t InputDefault::joy_axis(uint32_t p_last_id, int p_device, int p_axis, co _THREAD_SAFE_METHOD_; + ERR_FAIL_INDEX_V(p_axis, JOY_AXIS_MAX, p_last_id); + Joystick &joy = joy_names[p_device]; if (joy.last_axis[p_axis] == p_value.value) {