summaryrefslogtreecommitdiff
path: root/main_gui.c
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2006-10-21 23:31:34 +0000
committerDarkvater <darkvater@openttd.org>2006-10-21 23:31:34 +0000
commitee27bb497c0790d86da6025fa48034f01f36d6e0 (patch)
treebbd2a7ac7e0c3b558bf638e1779108ced158cb6a /main_gui.c
parent7f36a980c70d2444a68af5046e47c0313d67b2ef (diff)
downloadopenttd-ee27bb497c0790d86da6025fa48034f01f36d6e0.tar.xz
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
The last parameter should point to the end of the buffer (eg lastof(buf)) Courtesy of Tron.
Diffstat (limited to 'main_gui.c')
-rw-r--r--main_gui.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main_gui.c b/main_gui.c
index 1a5cacbac..5ddab1c81 100644
--- a/main_gui.c
+++ b/main_gui.c
@@ -658,7 +658,7 @@ static int GetStringListMaxWidth(StringID base_string, byte count)
max_width = 0;
for (i = 0; i != count; i++) {
- GetString(buffer, base_string + i);
+ GetString(buffer, base_string + i, lastof(buffer));
width = GetStringBoundingBox(buffer).width;
if (width > max_width) max_width = width;
}
@@ -2108,7 +2108,7 @@ static bool DrawScrollingStatusText(const NewsItem *ni, int pos)
str = ni->string_id;
}
- GetString(buf, str);
+ GetString(buf, str, lastof(buf));
s = buf;
d = buffer;