Emulation/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-04-02 10:51:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

prevent out of bound array access for unmapped input binds

Browse source
This commit is contained in:
Brad Parker 2018-09-15 01:21:03 -04:00
parent 09d27fc591
commit 19329fe7c7
4 changed files with 36 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
input/input_mapper.c
View file

@ -117,7 +117,7 @@ void input_mapper_poll(input_mapper_t *handle)
input_get_state_for_port(settings, i, &current_input); input_get_state_for_port(settings, i, &current_input);
for (j = 0; j < RARCH_CUSTOM_BIND_LIST_END; j++) for (j = 0; j < RARCH_CUSTOM_BIND_LIST_END; j++)
{ {
unsigned remap_button = unsigned remap_button =
settings->uints.input_keymapper_ids[i][j]; settings->uints.input_keymapper_ids[i][j];
bool remap_valid = remap_button != RETROK_UNKNOWN; bool remap_valid = remap_button != RETROK_UNKNOWN;
@ -137,7 +137,7 @@ void input_mapper_poll(input_mapper_t *handle)
0, 0, RETRO_DEVICE_KEYBOARD); 0, 0, RETRO_DEVICE_KEYBOARD);
key_event[j] = true; key_event[j] = true;
} }
/* key_event tracks if a key is pressed for ANY PLAYER, so we must check /* key_event tracks if a key is pressed for ANY PLAYER, so we must check
if the key was used by any player before releasing */ if the key was used by any player before releasing */
else if (!key_event[j]) else if (!key_event[j])
{ {
@ -152,10 +152,10 @@ void input_mapper_poll(input_mapper_t *handle)
/* gamepad remapping */ /* gamepad remapping */
case RETRO_DEVICE_JOYPAD: case RETRO_DEVICE_JOYPAD:
case RETRO_DEVICE_ANALOG: case RETRO_DEVICE_ANALOG:
/* this loop iterates on all users and all buttons, /* this loop iterates on all users and all buttons,
* and checks if a pressed button is assigned to any * and checks if a pressed button is assigned to any
* other button than the default one, then it sets * other button than the default one, then it sets
* the bit on the mapper input bitmap, later on the * the bit on the mapper input bitmap, later on the
* original input is cleared in input_state */ * original input is cleared in input_state */
BIT256_CLEAR_ALL(handle->buttons[i]); BIT256_CLEAR_ALL(handle->buttons[i]);
BIT256_CLEAR_ALL_PTR(&current_input); BIT256_CLEAR_ALL_PTR(&current_input);
@ -194,7 +194,7 @@ void input_mapper_poll(input_mapper_t *handle)
invert = -1; invert = -1;
handle->analog_value[i][ handle->analog_value[i][
remap_button - RARCH_FIRST_CUSTOM_BIND] = remap_button - RARCH_FIRST_CUSTOM_BIND] =
32767 * invert; 32767 * invert;
} }
} }
@ -204,7 +204,7 @@ void input_mapper_poll(input_mapper_t *handle)
{ {
unsigned k = j + RARCH_FIRST_CUSTOM_BIND; unsigned k = j + RARCH_FIRST_CUSTOM_BIND;
int16_t current_axis_value = current_input.analogs[j]; int16_t current_axis_value = current_input.analogs[j];
unsigned remap_axis = unsigned remap_axis =
settings->uints.input_remap_ids[i][k]; settings->uints.input_remap_ids[i][k];
if ( if (
@ -213,7 +213,7 @@ void input_mapper_poll(input_mapper_t *handle)
(remap_axis != RARCH_UNMAPPED) (remap_axis != RARCH_UNMAPPED)
)) ))
{ {
if (remap_axis < RARCH_FIRST_CUSTOM_BIND && if (remap_axis < RARCH_FIRST_CUSTOM_BIND &&
abs(current_axis_value) > *input_driver_get_float(INPUT_ACTION_AXIS_THRESHOLD) * 32767) abs(current_axis_value) > *input_driver_get_float(INPUT_ACTION_AXIS_THRESHOLD) * 32767)
{ {
BIT256_SET(handle->buttons[i], remap_axis); BIT256_SET(handle->buttons[i], remap_axis);
@ -221,18 +221,22 @@ void input_mapper_poll(input_mapper_t *handle)
else else
{ {
int invert = 1; int invert = 1;
unsigned remap_axis_bind = remap_axis - RARCH_FIRST_CUSTOM_BIND;
if ( (k % 2 == 0 && remap_axis % 2 != 0) || if ( (k % 2 == 0 && remap_axis % 2 != 0) ||
(k % 2 != 0 && remap_axis % 2 == 0) (k % 2 != 0 && remap_axis % 2 == 0)
) )
invert = -1; invert = -1;
handle->analog_value[i][ if (remap_axis_bind < sizeof(handle->analog_value[i]))
remap_axis - RARCH_FIRST_CUSTOM_BIND] = {
current_axis_value * invert; handle->analog_value[i][
remap_axis_bind] =
current_axis_value * invert;
}
#if 0 #if 0
RARCH_LOG("axis %d(%d) remapped to axis %d val %d\n", RARCH_LOG("axis %d(%d) remapped to axis %d val %d\n",
j, k, j, k,
remap_axis - RARCH_FIRST_CUSTOM_BIND, remap_axis - RARCH_FIRST_CUSTOM_BIND,
current_axis_value); current_axis_value);
#endif #endif

8
menu/cbs/menu_cbs_get_value.c
View file

@ -603,14 +603,12 @@ static void menu_action_setting_disp_set_label_input_desc(
remap_idx = remap_idx =
settings->uints.input_remap_ids[user_idx][btn_idx]; settings->uints.input_remap_ids[user_idx][btn_idx];
/*
if (remap_idx == RARCH_UNMAPPED)
settings->uints.input_remap_ids[user_idx][btn_idx] = RARCH_UNMAPPED;
*/
if (!system) if (!system)
return; return;
descriptor = system->input_desc_btn[user_idx][remap_idx]; if (remap_idx != RARCH_UNMAPPED)
descriptor = system->input_desc_btn[user_idx][remap_idx];
if (!string_is_empty(descriptor) && remap_idx < RARCH_FIRST_CUSTOM_BIND) if (!string_is_empty(descriptor) && remap_idx < RARCH_FIRST_CUSTOM_BIND)
strlcpy(s, descriptor, len); strlcpy(s, descriptor, len);

13
menu/cbs/menu_cbs_left.c
View file

@ -321,7 +321,7 @@ static int shader_action_parameter_left(unsigned type, const char *label, bool w
video_shader_driver_get_current_shader(&shader_info); video_shader_driver_get_current_shader(&shader_info);
param_prev = &shader_info.data->parameters[type - MENU_SETTINGS_SHADER_PARAMETER_0]; param_prev = &shader_info.data->parameters[type - MENU_SETTINGS_SHADER_PARAMETER_0];
param_menu = shader ? &shader->parameters[type - param_menu = shader ? &shader->parameters[type -
MENU_SETTINGS_SHADER_PARAMETER_0] : NULL; MENU_SETTINGS_SHADER_PARAMETER_0] : NULL;
if (!param_prev || !param_menu) if (!param_prev || !param_menu)
@ -338,7 +338,7 @@ static int audio_mixer_stream_volume_left(unsigned type, const char *label,
{ {
unsigned offset = (type - MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_VOLUME_BEGIN); unsigned offset = (type - MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_VOLUME_BEGIN);
float orig_volume = 0.0f; float orig_volume = 0.0f;
if (offset >= AUDIO_MIXER_MAX_STREAMS) if (offset >= AUDIO_MIXER_MAX_STREAMS)
return 0; return 0;
@ -385,9 +385,12 @@ static int action_left_input_desc(unsigned type, const char *label,
/* skip the not used buttons (unless they are at the end by calling the right desc function recursively /* skip the not used buttons (unless they are at the end by calling the right desc function recursively
also skip all the axes until analog remapping is implemented */ also skip all the axes until analog remapping is implemented */
if ((string_is_empty(system->input_desc_btn[user_idx][remap_idx]) && remap_idx < RARCH_CUSTOM_BIND_LIST_END) /*|| if (remap_idx != RARCH_UNMAPPED)
(remap_idx >= RARCH_FIRST_CUSTOM_BIND && remap_idx < RARCH_CUSTOM_BIND_LIST_END)*/) {
action_left_input_desc(type, label, wraparound); if ((string_is_empty(system->input_desc_btn[user_idx][remap_idx]) && remap_idx < RARCH_CUSTOM_BIND_LIST_END) /*||
(remap_idx >= RARCH_FIRST_CUSTOM_BIND && remap_idx < RARCH_CUSTOM_BIND_LIST_END)*/)
action_left_input_desc(type, label, wraparound);
}
return 0; return 0;
} }

11
menu/cbs/menu_cbs_right.c
View file

@ -157,9 +157,12 @@ int action_right_input_desc(unsigned type, const char *label,
/* skip the not used buttons (unless they are at the end by calling the right desc function recursively /* skip the not used buttons (unless they are at the end by calling the right desc function recursively
also skip all the axes until analog remapping is implemented */ also skip all the axes until analog remapping is implemented */
if ((string_is_empty(system->input_desc_btn[user_idx][remap_idx]) && remap_idx < RARCH_CUSTOM_BIND_LIST_END) /*|| if (remap_idx != RARCH_UNMAPPED)
(remap_idx >= RARCH_FIRST_CUSTOM_BIND && remap_idx < RARCH_CUSTOM_BIND_LIST_END)*/) {
action_right_input_desc(type, label, wraparound); if ((string_is_empty(system->input_desc_btn[user_idx][remap_idx]) && remap_idx < RARCH_CUSTOM_BIND_LIST_END) /*||
(remap_idx >= RARCH_FIRST_CUSTOM_BIND && remap_idx < RARCH_CUSTOM_BIND_LIST_END)*/)
action_right_input_desc(type, label, wraparound);
}
#if 0 #if 0
int i = 0; int i = 0;
@ -205,7 +208,7 @@ static int audio_mixer_stream_volume_right(unsigned type, const char *label,
{ {
unsigned offset = (type - MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_VOLUME_BEGIN); unsigned offset = (type - MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_VOLUME_BEGIN);
float orig_volume = 0.0f; float orig_volume = 0.0f;
if (offset >= AUDIO_MIXER_MAX_STREAMS) if (offset >= AUDIO_MIXER_MAX_STREAMS)
return 0; return 0;