hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed unsafe use of localtime

Browse Source 
Since localtime is not thread-safe it should not be used in multithreaded
contexts. For this reason all calls to localtime were changed to localtime_r
in code where concurrency issues were possible.

Internal tests were left unchanged because they aren't multithreaded.
This commit is contained in:
Johan Wikman
2015-11-19 15:36:40 +02:00
committed by Markus Makela
parent 84d2c72db2
commit 6164b7f301
9 changed files with 43 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/modules/filter/dbfwfilter.c
View File

@ -1653,15 +1653,15 @@ GWBUF* gen_dummy_error(FW_SESSION* session, char* msg)
bool inside_timerange(TIMERANGE* comp)
{
struct tm* tm_now;
struct tm tm_now;
struct tm tm_before, tm_after;
time_t before, after, now, time_now;
double to_before, to_after;
time(&time_now);
tm_now = localtime(&time_now);
memcpy(&tm_before, tm_now, sizeof(struct tm));
memcpy(&tm_after, tm_now, sizeof(struct tm));
localtime_r(&time_now, &tm_now);
memcpy(&tm_before, &tm_now, sizeof(struct tm));
memcpy(&tm_after, &tm_now, sizeof(struct tm));
tm_before.tm_sec = comp->start.tm_sec;
@ -1674,7 +1674,7 @@ bool inside_timerange(TIMERANGE* comp)
before = mktime(&tm_before);
after = mktime(&tm_after);
now = mktime(tm_now);
now = mktime(&tm_now);
to_before = difftime(now, before);
to_after = difftime(now, after);
@ -1730,10 +1730,10 @@ bool rule_matches(FW_INSTANCE* my_instance, FW_SESSION* my_session, GWBUF *queue
QUERYSPEED* queryspeed = NULL;
QUERYSPEED* rule_qs = NULL;
time_t time_now;
struct tm* tm_now;
struct tm tm_now;
time(&time_now);
tm_now = localtime(&time_now);
localtime_r(&time_now, &tm_now);
matches = false;
is_sql = modutil_is_SQL(queue) || modutil_is_SQL_prepare(queue);
@ -1781,7 +1781,9 @@ bool rule_matches(FW_INSTANCE* my_instance, FW_SESSION* my_session, GWBUF *queue
{
matches = true;
msg = strdup("Permission denied at this time.");
MXS_INFO("dbfwfilter: rule '%s': query denied at: %s", rulelist->rule->name, asctime(tm_now));
char buffer[32]; // asctime documentation requires 26
asctime_r(&tm_now, buffer);
MXS_INFO("dbfwfilter: rule '%s': query denied at: %s", rulelist->rule->name, buffer);
goto queryresolved;
}
else

7
server/modules/filter/topfilter.c
View File

@ -387,8 +387,11 @@ closeSession(FILTER *instance, void *session)
}
}
fprintf(fp, "-----------+-----------------------------------------------------------------\n");
fprintf(fp, "\n\nSession started %s",
asctime(localtime(&my_session->connect.tv_sec)));
struct tm tm;
localtime_r(&my_session->connect.tv_sec, &tm);
char buffer[32]; // asctime_r documentation requires 26
asctime_r(&tm, buffer);
fprintf(fp, "\n\nSession started %s", buffer);
if (my_session->clientHost)
{
fprintf(fp, "Connection from %s\n",