summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoryexo <yexo@openttd.org>2011-09-23 12:26:25 +0000
committeryexo <yexo@openttd.org>2011-09-23 12:26:25 +0000
commitbabe53351ee7938281b545c2a4c34abdc1161e0f (patch)
tree2c4db609dab83a7ab1ab1745d68496620c45811a /src
parent09c293d2ced196f659c8abeba0183ea6832883ca (diff)
downloadopenttd-babe53351ee7938281b545c2a4c34abdc1161e0f.tar.xz
(svn r22952) -Fix: properly limit the length of strings in a choice list
Diffstat (limited to 'src')
-rw-r--r--src/newgrf_text.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/newgrf_text.cpp b/src/newgrf_text.cpp
index 74b024ca9..c086bae9a 100644
--- a/src/newgrf_text.cpp
+++ b/src/newgrf_text.cpp
@@ -371,7 +371,9 @@ struct UnmappedChoiceList : ZeroedMemoryAllocator {
for (int i = 0; i < count; i++) {
int idx = (this->type == SCC_GENDER_LIST ? lm->GetReverseMapping(i, true) : i + 1);
const char *str = this->strings[this->strings.Contains(idx) ? idx : 0];
- size_t len = strlen(str);
+ /* Limit the length of the string we copy to 0xFE. The length is written above
+ * as a byte and we need room for the final '\0'. */
+ size_t len = min(0xFE, strlen(str));
memcpy(d, str, len);
d += len;
*d++ = '\0';