mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix: don't use non-owning string pointer in StringParameter (#11952) 

The string pointer can become invalid before the reference is
dropped, causing out-of-bound access in windows like ErrorWindow,
or News that copy 10 or 20 parameters for their internals.

Co-authored-by: Jonathan G Rennison <j.g.rennison@gmail.com>
This commit is contained in:
Patric Stout 2024-02-02 23:01:54 +01:00 committed by GitHub
parent b1718478c8
commit 59a046de9c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/strings_internal.h
View File

@ -16,7 +16,6 @@
/** The data required to format and validate a single parameter of a string. */ /** The data required to format and validate a single parameter of a string. */
struct StringParameter { struct StringParameter {
uint64_t data; ///< The data of the parameter. uint64_t data; ///< The data of the parameter.
const char *string_view; ///< The string value, if it has any.
std::unique_ptr<std::string> string; ///< Copied string value, if it has any. std::unique_ptr<std::string> string; ///< Copied string value, if it has any.
char32_t type; ///< The #StringControlCode to interpret this data with when it's the first parameter, otherwise '\0'. char32_t type; ///< The #StringControlCode to interpret this data with when it's the first parameter, otherwise '\0'.
}; };
@ -106,7 +105,7 @@ public:
const char *GetNextParameterString() const char *GetNextParameterString()
{ {
auto ptr = GetNextParameterPointer(); auto ptr = GetNextParameterPointer();
return ptr->string != nullptr ? ptr->string->c_str() : ptr->string_view; return ptr->string != nullptr ? ptr->string->c_str() : nullptr;
} }
/** /**
@ -152,7 +151,6 @@ public:
assert(n < this->parameters.size()); assert(n < this->parameters.size());
this->parameters[n].data = v; this->parameters[n].data = v;
this->parameters[n].string.reset(); this->parameters[n].string.reset();
this->parameters[n].string_view = nullptr;
} }
template <typename T, std::enable_if_t<std::is_base_of<StrongTypedefBase, T>::value, int> = 0> template <typename T, std::enable_if_t<std::is_base_of<StrongTypedefBase, T>::value, int> = 0>
@ -165,8 +163,7 @@ public:
{ {
assert(n < this->parameters.size()); assert(n < this->parameters.size());
this->parameters[n].data = 0; this->parameters[n].data = 0;
this->parameters[n].string.reset(); this->parameters[n].string = std::make_unique<std::string>(str);
this->parameters[n].string_view = str;
} }
void SetParam(size_t n, const std::string &str) { this->SetParam(n, str.c_str()); } void SetParam(size_t n, const std::string &str) { this->SetParam(n, str.c_str()); }
@ -176,13 +173,12 @@ public:
assert(n < this->parameters.size()); assert(n < this->parameters.size());
this->parameters[n].data = 0; this->parameters[n].data = 0;
this->parameters[n].string = std::make_unique<std::string>(std::move(str)); this->parameters[n].string = std::make_unique<std::string>(std::move(str));
this->parameters[n].string_view = nullptr;
} }
uint64_t GetParam(size_t n) const uint64_t GetParam(size_t n) const
{ {
assert(n < this->parameters.size()); assert(n < this->parameters.size());
assert(this->parameters[n].string_view == nullptr && this->parameters[n].string == nullptr); assert(this->parameters[n].string == nullptr);
return this->parameters[n].data; return this->parameters[n].data;
} }
@ -195,7 +191,7 @@ public:
{ {
assert(n < this->parameters.size()); assert(n < this->parameters.size());
auto &param = this->parameters[n]; auto &param = this->parameters[n];
return param.string != nullptr ? param.string->c_str() : param.string_view; return param.string != nullptr ? param.string->c_str() : nullptr;
} }
}; };