diff options
| author | Darkvater <Darkvater@openttd.org> | 2006-10-21 23:31:34 +0000 |
|---|---|---|
| committer | Darkvater <Darkvater@openttd.org> | 2006-10-21 23:31:34 +0000 |
| commit | 494c56475f04f0753d1ef7b8126612d3017df861 (patch) | |
| tree | bbd2a7ac7e0c3b558bf638e1779108ced158cb6a /newgrf_text.c | |
| parent | c15e699479ca81045db05af98ad86452b97572fd (diff) | |
| download | openttd-494c56475f04f0753d1ef7b8126612d3017df861.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 'newgrf_text.c')
| -rw-r--r-- | newgrf_text.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/newgrf_text.c b/newgrf_text.c index 0c576f006..d89475f96 100644 --- a/newgrf_text.c +++ b/newgrf_text.c @@ -292,7 +292,7 @@ StringID GetGRFStringID(uint32 grfid, uint16 stringid) } -char *GetGRFString(char *buff, uint16 stringid) +char *GetGRFString(char *buff, uint16 stringid, const char* last) { const GRFText *default_text = NULL; const GRFText *search_text; @@ -319,7 +319,7 @@ char *GetGRFString(char *buff, uint16 stringid) if (default_text != NULL) return strecpy(buff, default_text->text, NULL); /* Use the default string ID if the fallback string isn't available */ - return GetString(buff, _grf_text[stringid].def_string); + return GetString(buff, _grf_text[stringid].def_string, last); } /** |