ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1395 from reicast/baka/evdev_crash2 

evdev: If there was an error initializing a controller, don't proceed
This commit is contained in:
Christoph 2018-09-20 18:46:12 +02:00 committed by GitHub
parent edaf00df79 5b8749fbaa
commit 4000b88771
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/linux-dist/evdev.cpp
View File

@ -469,23 +469,32 @@
const char* mapping = (cfgExists("input", evdev_config_key) == 2 ? (tmp = cfgLoadStr("input", evdev_config_key, "")).c_str() : NULL); const char* mapping = (cfgExists("input", evdev_config_key) == 2 ? (tmp = cfgLoadStr("input", evdev_config_key, "")).c_str() : NULL);
free(evdev_config_key); free(evdev_config_key);
input_evdev_init(&evdev_controllers[port], evdev_device, mapping); int err = input_evdev_init(&evdev_controllers[port], evdev_device, mapping);
free(evdev_device); free(evdev_device);
for (i = 0; i < port; i++) // If there was an error initializing the controller, don't proceed any further
if (err == 0)
{ {
for (i = 0; i < port; i++)
{
// If the controller could not be loaded, skip this one as it can't interfere
if (evdev_controllers[i].fd < 0)
continue;
if (evdev_device_id[port] == evdev_device_id[i]) if (evdev_device_id[port] == evdev_device_id[i])
{ {
// Multiple controllers with the same device, check for multiple button assignments // Multiple controllers with the same device, check for multiple button assignments
if (input_evdev_button_duplicate_button(evdev_controllers[i].mapping, evdev_controllers[port].mapping)) if (input_evdev_button_duplicate_button(evdev_controllers[i].mapping, evdev_controllers[port].mapping))
{ {
printf("WARNING: One or more button(s) of this device is also used in the configuration of input device %d (mapping: %s)\n", i, evdev_controllers[i].mapping->name.c_str()); printf("WARNING: One or more button(s) of this device is also used in the configuration of input device %d (mapping: %s)\n", i,
evdev_controllers[i].mapping->name.c_str());
} }
} }
} }
mcfg_CreateController(port, GetMapleDeviceType(evdev_controllers[port].mapping->Maple_Device1, port), GetMapleDeviceType(evdev_controllers[port].mapping->Maple_Device2, port)); mcfg_CreateController(port, GetMapleDeviceType(evdev_controllers[port].mapping->Maple_Device1, port), GetMapleDeviceType(evdev_controllers[port].mapping->Maple_Device2, port));
}
} }
} }
} }