Skip to content

Commit

Permalink
prevent out of bound array access for unmapped input binds
Browse files Browse the repository at this point in the history
  • Loading branch information
Brad Parker committed Sep 15, 2018
1 parent 09d27fc commit 19329fe
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 28 deletions.
32 changes: 18 additions & 14 deletions input/input_mapper.c
View file
Expand Up @@ -117,7 +117,7 @@ void input_mapper_poll(input_mapper_t *handle)
input_get_state_for_port(settings, i, &current_input);
for (j = 0; j < RARCH_CUSTOM_BIND_LIST_END; j++)
{
unsigned remap_button =
unsigned remap_button =
settings->uints.input_keymapper_ids[i][j];
bool remap_valid = remap_button != RETROK_UNKNOWN;

Expand All @@ -137,7 +137,7 @@ void input_mapper_poll(input_mapper_t *handle)
0, 0, RETRO_DEVICE_KEYBOARD);
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 */
else if (!key_event[j])
{
Expand All @@ -152,10 +152,10 @@ void input_mapper_poll(input_mapper_t *handle)
/* gamepad remapping */
case RETRO_DEVICE_JOYPAD:
case RETRO_DEVICE_ANALOG:
/* this loop iterates on all users and all buttons,
* and checks if a pressed button is assigned to any
* other button than the default one, then it sets
* the bit on the mapper input bitmap, later on the
/* this loop iterates on all users and all buttons,
* and checks if a pressed button is assigned to any
* other button than the default one, then it sets
* the bit on the mapper input bitmap, later on the
* original input is cleared in input_state */
BIT256_CLEAR_ALL(handle->buttons[i]);
BIT256_CLEAR_ALL_PTR(&current_input);
Expand Down Expand Up @@ -194,7 +194,7 @@ void input_mapper_poll(input_mapper_t *handle)
invert = -1;

handle->analog_value[i][
remap_button - RARCH_FIRST_CUSTOM_BIND] =
remap_button - RARCH_FIRST_CUSTOM_BIND] =
32767 * invert;
}
}
Expand All @@ -204,7 +204,7 @@ void input_mapper_poll(input_mapper_t *handle)
{
unsigned k = j + RARCH_FIRST_CUSTOM_BIND;
int16_t current_axis_value = current_input.analogs[j];
unsigned remap_axis =
unsigned remap_axis =
settings->uints.input_remap_ids[i][k];

if (
Expand All @@ -213,26 +213,30 @@ void input_mapper_poll(input_mapper_t *handle)
(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)
{
BIT256_SET(handle->buttons[i], remap_axis);
}
else
{
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)
)
invert = -1;

handle->analog_value[i][
remap_axis - RARCH_FIRST_CUSTOM_BIND] =
current_axis_value * invert;
if (remap_axis_bind < sizeof(handle->analog_value[i]))
{
handle->analog_value[i][
remap_axis_bind] =
current_axis_value * invert;
}
#if 0
RARCH_LOG("axis %d(%d) remapped to axis %d val %d\n",
j, k,
j, k,
remap_axis - RARCH_FIRST_CUSTOM_BIND,
current_axis_value);
#endif
Expand Down
8 changes: 3 additions & 5 deletions menu/cbs/menu_cbs_get_value.c
View file
Expand Up @@ -603,14 +603,12 @@ static void menu_action_setting_disp_set_label_input_desc(

remap_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)
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)
strlcpy(s, descriptor, len);
Expand Down
13 changes: 8 additions & 5 deletions menu/cbs/menu_cbs_left.c
View file
Expand Up @@ -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);

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;

if (!param_prev || !param_menu)
Expand All @@ -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);
float orig_volume = 0.0f;

if (offset >= AUDIO_MIXER_MAX_STREAMS)
return 0;

Expand Down Expand Up @@ -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
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) /*||
(remap_idx >= RARCH_FIRST_CUSTOM_BIND && remap_idx < RARCH_CUSTOM_BIND_LIST_END)*/)
action_left_input_desc(type, label, wraparound);
if (remap_idx != RARCH_UNMAPPED)
{
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;
}
Expand Down
11 changes: 7 additions & 4 deletions menu/cbs/menu_cbs_right.c
View file
Expand Up @@ -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
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) /*||
(remap_idx >= RARCH_FIRST_CUSTOM_BIND && remap_idx < RARCH_CUSTOM_BIND_LIST_END)*/)
action_right_input_desc(type, label, wraparound);
if (remap_idx != RARCH_UNMAPPED)
{
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
int i = 0;
Expand Down Expand Up @@ -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);
float orig_volume = 0.0f;

if (offset >= AUDIO_MIXER_MAX_STREAMS)
return 0;

Expand Down

0 comments on commit 19329fe

Please sign in to comment.