mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r26505) -Fix (r23634, r26493): Incorrect usage of strecpy/strecat

release/1.5
frosch 2014-04-24 19:09:17 +00:00
parent d71cc434e4
commit fad2d3c709
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/game_text.cpp
View File

@ -379,7 +379,7 @@ void ReconsiderGameScriptLanguage()
if (_current_data == NULL) return; if (_current_data == NULL) return;
char temp[MAX_PATH]; char temp[MAX_PATH];
strecpy(temp, _current_language->file, temp + sizeof(temp)); strecpy(temp, _current_language->file, lastof(temp));
/* Remove the extension */ /* Remove the extension */
char *l = strrchr(temp, '.'); char *l = strrchr(temp, '.');

8
src/script/script_config.cpp
View File

@ -197,10 +197,10 @@ void ScriptConfig::SettingsToString(char *string, const char *last) const
/* If it doesn't fit, skip the next settings */ /* If it doesn't fit, skip the next settings */
if (string + needed_size > last) break; if (string + needed_size > last) break;
s = strecat(s, last, (*it).first); s = strecat(s, (*it).first, last);
s = strecat(s, last, "="); s = strecat(s, "=", last);
s = strecat(s, last, no); s = strecat(s, no, last);
s = strecat(s, last, ","); s = strecat(s, ",", last);
} }
/* Remove the last ',', but only if at least one setting was saved. */ /* Remove the last ',', but only if at least one setting was saved. */