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

Dangling pointer in evdev code (electric fence)

This commit is contained in:
Flyinghead 2018-07-18 11:19:53 +02:00
parent 673841d1df
commit 4fced53e25
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,7 +159,7 @@
mf.parse(fd); mf.parse(fd);
EvdevControllerMapping mapping = { EvdevControllerMapping mapping = {
mf.get("emulator", "mapping_name", "<Unknown>").c_str(), mf.get("emulator", "mapping_name", "<Unknown>"),
load_keycode(&mf, "dreamcast", "btn_a"), load_keycode(&mf, "dreamcast", "btn_a"),
load_keycode(&mf, "dreamcast", "btn_b"), load_keycode(&mf, "dreamcast", "btn_b"),
load_keycode(&mf, "dreamcast", "btn_c"), load_keycode(&mf, "dreamcast", "btn_c"),
@ -308,7 +308,7 @@
} }
} }
controller->mapping = &loaded_mappings.find(string(mapping_fname))->second; controller->mapping = &loaded_mappings.find(string(mapping_fname))->second;
printf("evdev: Using '%s' mapping\n", controller->mapping->name); printf("evdev: Using '%s' mapping\n", controller->mapping->name.c_str());
controller->init(); controller->init();
return 0; return 0;

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

@ -4,7 +4,7 @@
struct EvdevControllerMapping struct EvdevControllerMapping
{ {
const char* name; const std::string name;
const int Btn_A; const int Btn_A;
const int Btn_B; const int Btn_B;
const int Btn_C; const int Btn_C;