libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-11 19:23:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMMON: Strip whitespace before checking if an INI line is a comment.

Browse Source 
Fixes some versions of Reah failing to parse subtitle data.
This commit is contained in:
elasota 2023-05-07 22:03:49 -04:00 committed by Filippos Karapetis
parent 323ad92ad6
commit e219e4e04e
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/formats/ini-file.cpp
View File

@ -105,6 +105,8 @@ bool INIFile::loadFromStream(SeekableReadStream &stream) {
// Read a line // Read a line
String line = stream.readLine(); String line = stream.readLine();
line.trim();
if (line.size() == 0) { if (line.size() == 0) {
// Do nothing // Do nothing
} else if (line[0] == '#' || line[0] == ';' || line.hasPrefix("//")) { } else if (line[0] == '#' || line[0] == ';' || line.hasPrefix("//")) {
@ -156,30 +158,21 @@ bool INIFile::loadFromStream(SeekableReadStream &stream) {
} else { } else {
// This line should be a line with a 'key=value' pair, or an empty one. // This line should be a line with a 'key=value' pair, or an empty one.
// Skip leading whitespaces
const char *t = line.c_str();
while (isSpace(*t))
t++;
// Skip empty lines / lines with only whitespace
if (*t == 0)
continue;
// If no section has been set, this config file is invalid! // If no section has been set, this config file is invalid!
if (section.name.empty()) { if (section.name.empty()) {
error("INIFile::loadFromStream: Key/value pair found outside a section in line %d", lineno); error("INIFile::loadFromStream: Key/value pair found outside a section in line %d", lineno);
} }
// Split string at '=' into 'key' and 'value'. First, find the "=" delimeter. // Split string at '=' into 'key' and 'value'. First, find the "=" delimeter.
const char *p = strchr(t, '='); const char *p = strchr(line.c_str(), '=');
if (!p) { if (!p) {
if (!_suppressValuelessLineWarning) if (!_suppressValuelessLineWarning)
warning("Config file buggy: Junk found in line %d: '%s'", lineno, t); warning("Config file buggy: Junk found in line %d: '%s'", lineno, line.c_str());
kv.key = String(t); kv.key = line;
kv.value.clear(); kv.value.clear();
} else { } else {
// Extract the key/value pair // Extract the key/value pair
kv.key = String(t, p); kv.key = String(line.c_str(), p);
kv.value = String(p + 1); kv.value = String(p + 1);
} }