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

Translations: prevent remote crash with invalid translations

Browse Source
This commit is contained in:
Ekdohibs 2017-08-25 13:06:59 +02:00
parent d3f1743fdd
commit 6761e21383
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/util/string.cpp
View File

@ -866,7 +866,12 @@ void translate_string(const std::wstring &s, const std::wstring &textdomain,
// Here we have an argument; get its index and add the translated argument to the output. // Here we have an argument; get its index and add the translated argument to the output.
int arg_index = toutput[j] - L'1'; int arg_index = toutput[j] - L'1';
++j; ++j;
if (0 <= arg_index && (size_t)arg_index < args.size()) {
result << args[arg_index]; result << args[arg_index];
} else {
// This is not allowed: show an error message
errorstream << "Ignoring out-of-bounds argument escape sequence in translation" << std::endl;
}
} }
res = result.str(); res = result.str();
} }