From 3232a64598358038726e183941c69af642986da9 Mon Sep 17 00:00:00 2001 From: frosch Date: Thu, 24 Apr 2014 19:09:17 +0000 Subject: [PATCH] (svn r26505) -Fix (r23634, r26493): Incorrect usage of strecpy/strecat --- src/game/game_text.cpp | 2 +- src/script/script_config.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/game/game_text.cpp b/src/game/game_text.cpp index 1717dcf9aa..83dc9a6044 100644 --- a/src/game/game_text.cpp +++ b/src/game/game_text.cpp @@ -379,7 +379,7 @@ void ReconsiderGameScriptLanguage() if (_current_data == NULL) return; char temp[MAX_PATH]; - strecpy(temp, _current_language->file, temp + sizeof(temp)); + strecpy(temp, _current_language->file, lastof(temp)); /* Remove the extension */ char *l = strrchr(temp, '.'); diff --git a/src/script/script_config.cpp b/src/script/script_config.cpp index 95e2789542..768ff5e21a 100644 --- a/src/script/script_config.cpp +++ b/src/script/script_config.cpp @@ -197,10 +197,10 @@ void ScriptConfig::SettingsToString(char *string, const char *last) const /* If it doesn't fit, skip the next settings */ if (string + needed_size > last) break; - s = strecat(s, last, (*it).first); - s = strecat(s, last, "="); - s = strecat(s, last, no); - s = strecat(s, last, ","); + s = strecat(s, (*it).first, last); + s = strecat(s, "=", last); + s = strecat(s, no, last); + s = strecat(s, ",", last); } /* Remove the last ',', but only if at least one setting was saved. */