BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix a segfault caused by wrong textdomain lines in translation files (#11530)

Browse Source 
* The problem were lines like these:
  "# textdomain:"
* str_split does not add an empty last part if there is a delimiter
  at the end, but this was probably assumed here.
This commit is contained in:
DS 2021-08-12 20:06:18 +02:00 committed by GitHub
parent eefa39e47b
commit 0709946c75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/translation.cpp
View File

@ -64,7 +64,13 @@ void Translations::loadTranslation(const std::string &data)
line.resize(line.length() - 1); line.resize(line.length() - 1);
if (str_starts_with(line, "# textdomain:")) { if (str_starts_with(line, "# textdomain:")) {
textdomain = utf8_to_wide(trim(str_split(line, ':')[1])); auto parts = str_split(line, ':');
if (parts.size() < 2) {
errorstream << "Invalid textdomain translation line \"" << line
<< "\"" << std::endl;
continue;
}
textdomain = utf8_to_wide(trim(parts[1]));
} }
if (line.empty() || line[0] == '#') if (line.empty() || line[0] == '#')
continue; continue;