mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: [NewGRF] Display an error, if NewGRF reference out-of-bounds string parameters in gender/plural choices. (#13881)

pull/13882/head
frosch 2025-03-23 20:43:12 +01:00 committed by GitHub
parent 42eb513897
commit ca801d55d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/strings.cpp
View File

@ -1161,7 +1161,10 @@ static void FormatString(StringBuilder &builder, std::string_view str_arg, Strin
/* First read the meta data from the language file. */
size_t offset = ref_param_offset + (uint8_t)*str++;
int gender = 0;
if (!dry_run && args.GetTypeAtOffset(offset) != 0) {
if (offset >= args.GetNumParameters()) {
/* The offset may come from an external NewGRF, and be invalid. */
builder += "(invalid GENDER parameter)";
} else if (!dry_run && args.GetTypeAtOffset(offset) != 0) {
/* Now we need to figure out what text to resolve, i.e.
* what do we need to draw? So get the actual raw string
* first using the control code to get said string. */
@ -1202,7 +1205,11 @@ static void FormatString(StringBuilder &builder, std::string_view str_arg, Strin
case SCC_PLURAL_LIST: { // {P}
int plural_form = *str++; // contains the plural form for this string
size_t offset = ref_param_offset + (uint8_t)*str++;
const uint64_t *v = std::get_if<uint64_t>(&args.GetParam(offset)); // contains the number that determines plural
const uint64_t *v = nullptr;
/* The offset may come from an external NewGRF, and be invalid. */
if (offset < args.GetNumParameters()) {
v = std::get_if<uint64_t>(&args.GetParam(offset)); // contains the number that determines plural
}
if (v != nullptr) {
str = ParseStringChoice(str, DeterminePluralForm(static_cast<int64_t>(*v), plural_form), builder);
} else {

6
src/strings_internal.h
View File

@ -153,6 +153,12 @@ public:
return this->parameters.size() - this->offset;
}
/** Return the number of parameters. */
size_t GetNumParameters() const
{
return this->parameters.size();
}
/** Get the type of a specific element. */
char32_t GetTypeAtOffset(size_t offset) const
{