From 5b08387792dae0afbf91ab74808dc978bf418bca Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 19 Oct 2014 15:09:15 +0200 Subject: Core/Misc: Remove unsafe not thread-safe localtime() calls Replace not thread-safe localtime() calls with thread-safe localtime_r(). --- src/server/game/World/World.cpp | 3 ++- src/server/scripts/Commands/cs_guild.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/server') diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index a43baed9ae0..a8fa5f4b4bc 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -2935,7 +2935,8 @@ void World::InitCurrencyResetTime() // generate time by config time_t curTime = time(NULL); - tm localTm = *localtime(&curTime); + tm localTm; + localtime_r(&curTime, &localTm); localTm.tm_wday = getIntConfig(CONFIG_CURRENCY_RESET_DAY); localTm.tm_hour = getIntConfig(CONFIG_CURRENCY_RESET_HOUR); diff --git a/src/server/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp index e06fbde868c..e2428407c7b 100644 --- a/src/server/scripts/Commands/cs_guild.cpp +++ b/src/server/scripts/Commands/cs_guild.cpp @@ -280,7 +280,8 @@ public: // Format creation date char createdDateStr[20]; time_t createdDate = guild->GetCreatedDate(); - strftime(createdDateStr, 20, "%Y-%m-%d %H:%M:%S", localtime(&createdDate)); + tm localTm; + strftime(createdDateStr, 20, "%Y-%m-%d %H:%M:%S", localtime_r(&createdDate, &localTm)); handler->PSendSysMessage(LANG_GUILD_INFO_CREATION_DATE, createdDateStr); // Creation Date handler->PSendSysMessage(LANG_GUILD_INFO_MEMBER_COUNT, guild->GetMemberCount()); // Number of Members -- cgit v1.2.3