1
0
Fork 0

Fix 54be756: Terminating NUL byte was not skipped in ReadString().

pull/12462/head
Peter Nelson 2024-04-09 12:08:24 +01:00
parent 883d3e7a9f
commit 64d686fe04
No known key found for this signature in database
GPG Key ID: 8EF8F0A467DF75ED
1 changed files with 2 additions and 1 deletions

View File

@ -274,7 +274,8 @@ public:
char *string = reinterpret_cast<char *>(data);
size_t string_length = ttd_strnlen(string, Remaining());
Skip(string_length);
/* Skip past the terminating NUL byte if it is present, but not more than remaining. */
Skip(std::min(string_length + 1, Remaining()));
return std::string_view(string, string_length);
}