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

Codechange: Prevent nested encoded strings.

pull/13741/head
Peter Nelson 2025-03-04 18:18:28 +00:00 committed by Peter Nelson
parent b55af05626
commit b979f0414c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/strings.cpp
View File

@ -119,6 +119,16 @@ EncodedString GetEncodedStringWithArgs(StringID str, std::span<const StringParam
void operator()(const std::string &value) void operator()(const std::string &value)
{ {
#ifdef WITH_ASSERT
/* Don't allow an encoded string to contain another encoded string. */
if (!value.empty()) {
char32_t c;
const char *p = value.data();
if (Utf8Decode(&c, p)) {
assert(c != SCC_ENCODED && c != SCC_ENCODED_INTERNAL);
}
}
#endif /* WITH_ASSERT */
Utf8Encode(output, SCC_ENCODED_STRING); Utf8Encode(output, SCC_ENCODED_STRING);
fmt::format_to(this->output, "{}", value); fmt::format_to(this->output, "{}", value);
} }