mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1287 from CautiousAlbino/master

Browse Source 
Fix nasty breakage when joypad index >= MAX_PLAYERS.
This commit is contained in:
Twinaphex 2014-12-15 15:52:44 +01:00
commit 0f1cb9863e
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
input/input_autodetect.c
View File

@ -161,6 +161,9 @@ void input_config_autoconfigure_joypad(unsigned idx,
const struct retro_keybind *input_get_auto_bind(unsigned port, unsigned id) const struct retro_keybind *input_get_auto_bind(unsigned port, unsigned id)
{ {
unsigned int joy_idx = g_settings.input.joypad_map[port]; unsigned joy_idx = g_settings.input.joypad_map[port];
if (joy_idx < MAX_PLAYERS)
return &g_settings.input.autoconf_binds[joy_idx][id]; return &g_settings.input.autoconf_binds[joy_idx][id];
else
return NULL;
} }

6
input/input_common.c
View File

@ -38,7 +38,7 @@ bool input_joypad_set_rumble(const rarch_joypad_driver_t *drv,
if (!drv || !drv->set_rumble) if (!drv || !drv->set_rumble)
return false; return false;
unsigned int joy_idx = g_settings.input.joypad_map[port]; unsigned joy_idx = g_settings.input.joypad_map[port];
if (joy_idx >= MAX_PLAYERS) if (joy_idx >= MAX_PLAYERS)
return false; return false;
@ -51,7 +51,7 @@ static bool input_joypad_is_pressed(
const struct retro_keybind *binds, const struct retro_keybind *binds,
unsigned key) unsigned key)
{ {
unsigned int joy_idx = g_settings.input.joypad_map[port]; unsigned joy_idx = g_settings.input.joypad_map[port];
if (joy_idx >= MAX_PLAYERS) if (joy_idx >= MAX_PLAYERS)
return false; return false;
@ -98,7 +98,7 @@ int16_t input_joypad_analog(const rarch_joypad_driver_t *drv,
if (!drv) if (!drv)
return 0; return 0;
unsigned int joy_idx = g_settings.input.joypad_map[port]; unsigned joy_idx = g_settings.input.joypad_map[port];
if (joy_idx >= MAX_PLAYERS) if (joy_idx >= MAX_PLAYERS)
return 0; return 0;

12
settings_data.c
View File

@ -567,16 +567,12 @@ static int setting_data_bool_action_toggle_savestates(void *data, unsigned actio
static int setting_data_action_start_bind_device(void *data) static int setting_data_action_start_bind_device(void *data)
{ {
unsigned *p = NULL;
rarch_setting_t *setting = (rarch_setting_t*)data; rarch_setting_t *setting = (rarch_setting_t*)data;
if (!setting) if (!setting)
return -1; return -1;
p = (unsigned*)&g_settings.input.joypad_map[setting->index_offset]; g_settings.input.joypad_map[setting->index_offset] = setting->index_offset;
(*p) = setting->index_offset;
return 0; return 0;
} }
@ -588,12 +584,14 @@ static int setting_data_action_toggle_bind_device(void *data, unsigned action)
if (!setting) if (!setting)
return -1; return -1;
p = (unsigned*)&g_settings.input.joypad_map[setting->index_offset]; p = &g_settings.input.joypad_map[setting->index_offset];
switch (action) switch (action)
{ {
case MENU_ACTION_LEFT: case MENU_ACTION_LEFT:
if ((*p) > 0) if ((*p) >= MAX_PLAYERS)
*p = MAX_PLAYERS - 1;
else if ((*p) > 0)
(*p)--; (*p)--;
break; break;
case MENU_ACTION_RIGHT: case MENU_ACTION_RIGHT: