edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7832 from Robyt3/Base-Localtime-Threadlocal

Browse source 
Ensure uses of `localtime` function are thread-safe
This commit is contained in:
Dennis Felsing 2024-01-21 10:36:31 +00:00 committed by GitHub
parent 0cceb786cc c1a1720a08
commit 94931fadc0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/base/system.cpp
View file

@ -2618,13 +2618,24 @@ int time_timestamp()
return time(0); return time(0);
} }
static struct tm *time_localtime_threadlocal(time_t *time_data)
{
#if defined(CONF_FAMILY_WINDOWS)
// The result of localtime is thread-local on Windows
// https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/localtime-localtime32-localtime64
return localtime(time_data);
#else
// Thread-local buffer for the result of localtime_r
thread_local struct tm time_info_buf;
return localtime_r(time_data, &time_info_buf);
#endif
}
int time_houroftheday() int time_houroftheday()
{ {
time_t time_data; time_t time_data;
struct tm *time_info;
time(&time_data); time(&time_data);
time_info = localtime(&time_data); struct tm *time_info = time_localtime_threadlocal(&time_data);
return time_info->tm_hour; return time_info->tm_hour;
} }
@ -2651,7 +2662,7 @@ static bool time_iseasterday(time_t time_data, struct tm *time_info)
for(int day_offset = -1; day_offset <= 2; day_offset++) for(int day_offset = -1; day_offset <= 2; day_offset++)
{ {
time_data = time_data + day_offset * 60 * 60 * 24; time_data = time_data + day_offset * 60 * 60 * 24;
time_info = localtime(&time_data); time_info = time_localtime_threadlocal(&time_data);
if(time_info->tm_mon == month - 1 && time_info->tm_mday == day) if(time_info->tm_mon == month - 1 && time_info->tm_mday == day)
return true; return true;
} }
@ -2662,7 +2673,7 @@ ETimeSeason time_season()
{ {
time_t time_data; time_t time_data;
time(&time_data); time(&time_data);
struct tm *time_info = localtime(&time_data); struct tm *time_info = time_localtime_threadlocal(&time_data);
if((time_info->tm_mon == 11 && time_info->tm_mday == 31) || (time_info->tm_mon == 0 && time_info->tm_mday == 1)) if((time_info->tm_mon == 11 && time_info->tm_mday == 31) || (time_info->tm_mon == 0 && time_info->tm_mday == 1))
{ {
@ -3431,8 +3442,7 @@ int str_base64_decode(void *dst_raw, int dst_size, const char *data)
#endif #endif
void str_timestamp_ex(time_t time_data, char *buffer, int buffer_size, const char *format) void str_timestamp_ex(time_t time_data, char *buffer, int buffer_size, const char *format)
{ {
struct tm *time_info; struct tm *time_info = time_localtime_threadlocal(&time_data);
time_info = localtime(&time_data);
strftime(buffer, buffer_size, format, time_info); strftime(buffer, buffer_size, format, time_info);
buffer[buffer_size - 1] = 0; /* assure null termination */ buffer[buffer_size - 1] = 0; /* assure null termination */
} }