mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

input_state_wrap - do not attempt to access joypad or sec_joypad

Browse Source 
pointers if non-NULL
This commit is contained in:
twinaphex 2021-08-29 16:57:41 +02:00
parent cf7b30481b
commit 46fb61bede
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
retroarch.c
View File

@ -478,8 +478,9 @@ static int16_t input_state_wrap(
{
if (id == RETRO_DEVICE_ID_JOYPAD_MASK)
{
ret |= joypad->state(
joypad_info, binds[port], port);
if (joypad)
ret |= joypad->state(
joypad_info, binds[port], port);
#ifdef HAVE_MFI
if (sec_joypad)
ret |= sec_joypad->state(
@ -504,27 +505,33 @@ static int16_t input_state_wrap(
const uint32_t joyaxis = (bind_joyaxis != AXIS_NONE)
? bind_joyaxis : autobind_joyaxis;
if ((uint16_t)joykey != NO_BTN && joypad->button(
port, (uint16_t)joykey))
return 1;
if (joyaxis != AXIS_NONE &&
((float)abs(joypad->axis(port, joyaxis))
/ 0x8000) > axis_threshold)
return 1;
if (joypad)
{
if ((uint16_t)joykey != NO_BTN && joypad->button(
port, (uint16_t)joykey))
return 1;
if (joyaxis != AXIS_NONE &&
((float)abs(joypad->axis(port, joyaxis))
/ 0x8000) > axis_threshold)
return 1;
}
#ifdef HAVE_MFI
if ((uint16_t)joykey != NO_BTN && sec_joypad->button(
port, (uint16_t)joykey))
return 1;
if (joyaxis != AXIS_NONE &&
((float)abs(sec_joypad->axis(port, joyaxis))
/ 0x8000) > axis_threshold)
return 1;
if (sec_joypad)
{
if ((uint16_t)joykey != NO_BTN && sec_joypad->button(
port, (uint16_t)joykey))
return 1;
if (joyaxis != AXIS_NONE &&
((float)abs(sec_joypad->axis(port, joyaxis))
/ 0x8000) > axis_threshold)
return 1;
}
#endif
}
}
}
if (current_input->input_state)
if (current_input && current_input->input_state)
ret |= current_input->input_state(
data,
joypad,