mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent crash pointed out by LIJI - primary_joypad can be NULL (#13002)

Browse Source
This commit is contained in:
Autechre 2021-09-17 05:20:09 +02:00 committed by GitHub
parent d8db234df0
commit 62a66ff0e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
retroarch.c
View File

@ -17877,12 +17877,17 @@ bool input_set_rumble_state(unsigned port,
input_driver_state_t *input_driver_st = &(p_rarch->input_driver_state); input_driver_state_t *input_driver_st = &(p_rarch->input_driver_state);
settings_t *settings = p_rarch->configuration_settings; settings_t *settings = p_rarch->configuration_settings;
unsigned joy_idx = settings->uints.input_joypad_index[port]; unsigned joy_idx = settings->uints.input_joypad_index[port];
unsigned rumble_gain = settings->uints.input_rumble_gain;
uint16_t scaled_strength = strength; uint16_t scaled_strength = strength;
/* If gain setting is not suported, do software gain control */ /* If gain setting is not suported, do software gain control */
if (!input_driver_st->primary_joypad->set_rumble_gain) if (input_driver_st && input_driver_st->primary_joypad)
scaled_strength = (rumble_gain * strength) / 100.0; {
if (!input_driver_st->primary_joypad->set_rumble_gain)
{
unsigned rumble_gain = settings->uints.input_rumble_gain;
scaled_strength = (rumble_gain * strength) / 100.0;
}
}
return input_driver_set_rumble( return input_driver_set_rumble(
input_driver_st, input_driver_st,