diff options
| author | smatz <smatz@openttd.org> | 2007-12-08 18:50:39 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2007-12-08 18:50:39 +0000 |
| commit | 2a62aa1ccda7ab0e8c8774f75f50210ff4dd6480 (patch) | |
| tree | 0b95686d855b933403c898b7a6c165b5ec2c2f09 /src/station_gui.cpp | |
| parent | b47bce651e64ddeab722f599c0a682281b626c45 (diff) | |
| download | openttd-2a62aa1ccda7ab0e8c8774f75f50210ff4dd6480.tar.xz | |
(svn r11601) -Codechange: more strict break conditions for _userstring, assert when it overflows anyway (eg. code change without proper check change)
Diffstat (limited to 'src/station_gui.cpp')
| -rw-r--r-- | src/station_gui.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/station_gui.cpp b/src/station_gui.cpp index 17a2e27a6..9cc342830 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -807,7 +807,7 @@ static void DrawStationViewWindow(Window *w) b = InlineString(b, STR_000C_ACCEPTS); for (CargoID i = 0; i < NUM_CARGO; i++) { - if (b >= endof(_userstring) - 5 - 1) break; + if (b >= lastof(_userstring) - (1 + 2 * 4)) break; // ',' or ' ' and two calls to Utf8Encode() if (HasBit(st->goods[i].acceptance_pickup, GoodsEntry::ACCEPTANCE)) { if (first) { first = false; @@ -824,6 +824,10 @@ static void DrawStationViewWindow(Window *w) if (first) b = InlineString(b, STR_00D0_NOTHING); *b = '\0'; + + /* Make sure we detect any buffer overflow */ + assert(b < endof(_userstring)); + DrawStringMultiLine(2, 67, STR_SPEC_USERSTRING, 245); } else { // extended window with list of cargo ratings DrawString(2, 67, STR_3034_LOCAL_RATING_OF_TRANSPORT, TC_FROMSTRING); |