diff options
| author | tron <tron@openttd.org> | 2005-05-15 18:50:55 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-05-15 18:50:55 +0000 |
| commit | 4eebeff58cf65654f0ad2083b83f701c761dcbd8 (patch) | |
| tree | ad6dc27f46725e511e93e061f51683311027ec65 /misc_cmd.c | |
| parent | 0375f303364393e80cae54705c6e2177ed0674b8 (diff) | |
| download | openttd-4eebeff58cf65654f0ad2083b83f701c761dcbd8.tar.xz | |
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
Diffstat (limited to 'misc_cmd.c')
| -rw-r--r-- | misc_cmd.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/misc_cmd.c b/misc_cmd.c index 576e2e8bf..eca0eba6c 100644 --- a/misc_cmd.c +++ b/misc_cmd.c @@ -129,7 +129,7 @@ int32 CmdChangeCompanyName(int x, int y, uint32 flags, uint32 p1, uint32 p2) StringID str; Player *p; - str = AllocateNameUnique((const char*)_decode_parameters, 4); + str = AllocateNameUnique(_cmd_text, 4); if (str == 0) return CMD_ERROR; if (flags & DC_EXEC) { @@ -153,7 +153,7 @@ int32 CmdChangePresidentName(int x, int y, uint32 flags, uint32 p1, uint32 p2) StringID str; Player *p; - str = AllocateNameUnique((const char*)_decode_parameters, 4); + str = AllocateNameUnique(_cmd_text, 4); if (str == 0) return CMD_ERROR; if (flags & DC_EXEC) { @@ -162,7 +162,10 @@ int32 CmdChangePresidentName(int x, int y, uint32 flags, uint32 p1, uint32 p2) p->president_name_1 = str; if (p->name_1 == STR_SV_UNNAMED) { - ttd_strlcat((char*)_decode_parameters, " Transport", sizeof(_decode_parameters)); + char buf[80]; + + snprintf(buf, lengthof(buf), "%s Transport", _cmd_text); + _cmd_text = buf; DoCommandByTile(0, 0, 0, DC_EXEC, CMD_CHANGE_COMPANY_NAME); } MarkWholeScreenDirty(); |