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

Fixed #656: crash on startup

Browse source 
Amiberry would crash on startup if the controller.cfg file contained empty lines
This commit is contained in:
Dimitris Panokostas 2020-06-11 23:40:26 +02:00
parent 6da5e9136a
commit 7a82b8a90b
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/osdep/amiberry_input.cpp
View file

@ -481,35 +481,35 @@ int find_retroarch(const TCHAR* find_setting, char* retroarch_file, host_input_b
std::string line; std::string line;
std::string delimiter = " = "; std::string delimiter = " = ";
auto tempbutton = -1; auto tempbutton = -1;
// read each line in // read each line in
while (std::getline(readFile, line)) while (std::getline(readFile, line) && line.length() > 1)
{ {
if (strncmp(find_setting, "count_hats", 10) == 0) if (strncmp(find_setting, "count_hats", 10) == 0)
{ {
auto param = line.substr(line.find(delimiter) + delimiter.length(), line.length()); auto param = line.substr(line.find(delimiter) + delimiter.length(), line.length());
// remove leading " // remove leading "
if (param.at(0) == '"') if (param.at(0) == '"')
param.erase(0, 1); param.erase(0, 1);
// remove trailing " // remove trailing "
if (param.at(param.length() - 1) == '"') if (param.at(param.length() - 1) == '"')
param.erase(param.length() - 1, 1); param.erase(param.length() - 1, 1);
if (param.find("h") == 0)
{
tempbutton = 1;
break;
}
} if (param.find('h') == 0)
{
tempbutton = 1;
break;
}
const auto option = line.substr(0, line.find(delimiter)); }
// exit if we got no result from splitting the string
if (option != line) const auto option = line.substr(0, line.find(delimiter));
// exit if we got no result from splitting the string
if (option != line)
{ {
if (option != find_setting) if (option != find_setting)
continue; continue;
// using the " = " to work out which is the option, and which is the parameter. // using the " = " to work out which is the option, and which is the parameter.
auto param = line.substr(line.find(delimiter) + delimiter.length(), line.length()); auto param = line.substr(line.find(delimiter) + delimiter.length(), line.length());
@ -525,7 +525,7 @@ int find_retroarch(const TCHAR* find_setting, char* retroarch_file, host_input_b
if (param.find('h') != 0) // check it isn't some kind of hat starting 'h' (so if D-pad uses buttons) if (param.find('h') != 0) // check it isn't some kind of hat starting 'h' (so if D-pad uses buttons)
{ {
tempbutton = abs(atol(param.c_str())); tempbutton = abs(atol(param.c_str()));
} }
if (option == find_setting) if (option == find_setting)
break; break;
@ -545,7 +545,7 @@ bool find_retroarch_polarity(const TCHAR* find_setting, char* retroarch_file)
auto tempbutton = false; auto tempbutton = false;
// read each line in // read each line in
while (std::getline(readFile, line)) while (std::getline(readFile, line) && line.length() > 1)
{ {
const auto option = line.substr(0, line.find(delimiter)); const auto option = line.substr(0, line.find(delimiter));
@ -597,7 +597,7 @@ const TCHAR* find_retroarch_key(const TCHAR* find_setting_prefix, int player, co
} }
// read each line in // read each line in
while (std::getline(read_file, line)) while (std::getline(read_file, line) && line.length() > 1)
{ {
const auto option = line.substr(0, line.find(delimiter)); const auto option = line.substr(0, line.find(delimiter));