Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codefix #12162, 3105d0b: Textbuf::Assign read beyond std::string_view (#12177)

Browse Source
This commit is contained in:
rubidium42 2024-03-08 14:26:14 +01:00 committed by GitHub
parent 63b9284a7e
commit aef8a345b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/textbuf.cpp
View File

@ -413,9 +413,11 @@ void Textbuf::Assign(StringID string)
*/
void Textbuf::Assign(const std::string_view text)
{
const char *last_of = &this->buf[this->max_bytes - 1];
strecpy(this->buf, text.data(), last_of);
StrMakeValidInPlace(this->buf, last_of, SVS_NONE);
size_t bytes = std::min<size_t>(this->max_bytes - 1, text.size());
memcpy(this->buf, text.data(), bytes);
this->buf[bytes] = '\0';
StrMakeValidInPlace(this->buf, &this->buf[bytes], SVS_NONE);
/* Make sure the name isn't too long for the text buffer in the number of
* characters (not bytes). max_chars also counts the '\0' characters. */