pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed memory leaks in amiberry_input

Browse source
This commit is contained in:
Dimitris Panokostas 2020-07-05 02:11:37 +02:00
parent d4953c6dc0
commit e08a305b25
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/osdep/amiberry_input.cpp
View file

@ -421,12 +421,12 @@ static int get_kb_num()
static const TCHAR* get_kb_friendlyname(int kb) static const TCHAR* get_kb_friendlyname(int kb)
{ {
return strdup("Default Keyboard"); return "Default Keyboard";
} }
static const TCHAR* get_kb_uniquename(int kb) static const TCHAR* get_kb_uniquename(int kb)
{ {
return strdup("KEYBOARD0"); return "KEYBOARD0";
} }
static int get_kb_widget_num(int kb) static int get_kb_widget_num(int kb)
@ -593,7 +593,7 @@ const TCHAR* find_retroarch_key(const TCHAR* find_setting_prefix, int player, co
std::ifstream read_file(retroarch_file); std::ifstream read_file(retroarch_file);
std::string line; std::string line;
std::string delimiter = " = "; std::string delimiter = " = ";
auto output = "nul"; const auto* output = "nul";
// //
std::string find_setting = find_setting_prefix; std::string find_setting = find_setting_prefix;
@ -997,15 +997,18 @@ static void unacquire_joystick(int num)
static const TCHAR* get_joystick_friendlyname(const int joy) static const TCHAR* get_joystick_friendlyname(const int joy)
{ {
auto* const tmp1 = new char[255]; const char fmt[] = "RetroArch Keyboard as Joystick [#%d]";
char tmp1[255];
for (auto n = 0; n < num_keys_as_joys; ++n) for (auto n = 0; n < num_keys_as_joys; ++n)
{ {
if (joy == n) if (joy == n)
{ {
if (host_keyboard_buttons[n].is_retroarch) if (host_keyboard_buttons[n].is_retroarch)
{ {
sprintf(tmp1, "RetroArch Keyboard as Joystick [#%d]", n + 1); snprintf(tmp1, sizeof tmp1, fmt, n + 1);
return tmp1; auto* const result = my_strdup(tmp1);
tmp1[0]= '\0';
return result;
} }
return "Keyboard as Joystick [Default]"; return "Keyboard as Joystick [Default]";
} }