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

Merge pull request #787 from reicast/holzhaus/evdev-buffer-overflow-fix 

linux-dist/evdev: Fix evdev_config_key buffer overflow
This commit is contained in:
Jan Holthuis 2015-08-21 14:41:07 +02:00
parent c733f20325 e35518aca1
commit 997ced7900
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/linux-dist/evdev.h
View File

@ -11,6 +11,7 @@ struct s_controller
typedef struct s_controller Controller;
#define EVDEV_DEVICE_CONFIG_KEY "evdev_device_id_%d"
#define EVDEV_DEVICE_STRING "/dev/input/event%d"
#ifdef TARGET_PANDORA

9
core/linux-dist/main.cpp
View File

@ -95,15 +95,18 @@ void emit_WriteCodeCache();
void SetupInput()
{
#if defined(USE_EVDEV)
char evdev_config_key[17];
int evdev_device_id[4] = { -1, -1, -1, -1 };
size_t size_needed;
int evdev_device_length, port, i;
char* evdev_device;
for (port = 0; port < 4; port++)
{
sprintf(evdev_config_key, "evdev_device_id_%d", port+1);
size_needed = snprintf(NULL, 0, EVDEV_DEVICE_CONFIG_KEY, port+1) + 1;
char* evdev_config_key = (char*)malloc(size_needed);
sprintf(evdev_config_key, EVDEV_DEVICE_CONFIG_KEY, port+1);
evdev_device_id[port] = cfgLoadInt("input", evdev_config_key, EVDEV_DEFAULT_DEVICE_ID(port+1));
// Check if the same device is already in use on another port
@ -127,6 +130,8 @@ void SetupInput()
input_evdev_init(&controllers[port], evdev_device);
free(evdev_device);
}
free(evdev_config_key);
}
#endif