Changeset ee6b30f

Timestamp:

Oct 8, 2017, 6:02:19 PM (7 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master

Children:

4fd3c04

Parents:

09530e6

git-author:

Anders Kaseorg <andersk@mit.edu> (10/07/17 03:25:44)

git-committer:

Anders Kaseorg <andersk@mit.edu> (10/08/17 18:02:19)

Message:

Avoid thread-unsafe functions ctime, localtime, strtok

BarnOwl seems to be growing threads at an alarming rate, so let’s be
sure these don’t turn into race conditions.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

Files:

• functions.c (modified) (5 diffs)
• message.c (modified) (8 diffs)
• zephyr.c (modified) (2 diffs)

functions.c

@@ -1226 +1226 @@
   FILE *file;
   time_t now;
+  struct tm tm;
   va_list ap;
 
@@ -1237 +1238 @@
   now = time(NULL);
 
-  tmpbuff = owl_util_format_time(localtime(&now));
+  tmpbuff = owl_util_format_time(localtime_r(&now, &tm));
   fprintf(file, "[%d -  %s - %lds]: ",
           (int) getpid(), tmpbuff, now - owl_global_get_starttime(&g));
@@ -1775 +1776 @@
   char buff[MAXPATHLEN+1];
   time_t start;
+  struct tm tm;
   int up, days, hours, minutes;
   owl_fmtext fm;
@@ -1800 +1802 @@
   owl_fmtext_append_normal(&fm, "\n");
 
-  tmpbuff = owl_util_format_time(localtime(&start));
+  tmpbuff = owl_util_format_time(localtime_r(&start, &tm));
   owl_fmtext_appendf_normal(&fm, "  Startup Time: %s\n", tmpbuff);
   g_free(tmpbuff);
@@ -3424 +3426 @@
   char *date;
   time_t now;
+  struct tm tm;
   char *buff;
 
   now = time(NULL);
-  date = owl_util_format_time(localtime(&now));
+  date = owl_util_format_time(localtime_r(&now, &tm));
 
   buff = g_strdup_printf("%s %s", date, string);

message.c

@@ -30 +30 @@
 void owl_message_init(owl_message *m)
 {
+  /* ctime_r requires a 26-byte buffer */
+  char timestr[26];
+
   m->id=owl_global_get_nextmsgid(&g);
   owl_message_set_direction_none(m);
@@ -43 +46 @@
   /* save the time */
   m->time = time(NULL);
-  m->timestr = g_strdup(ctime(&m->time));
-  m->timestr[strlen(m->timestr)-1] = '\0';
+  ctime_r(&m->time, timestr);
+  m->timestr = g_strndup(timestr, strlen(timestr) - 1);
 
   m->fmtext = NULL;
@@ -349 +352 @@
 CALLER_OWN char *owl_message_format_time(const owl_message *m)
 {
-  return owl_util_format_time(localtime(&m->time));
+  struct tm tm;
+  return owl_util_format_time(localtime_r(&m->time, &tm));
 }
 
@@ -593 +597 @@
 CALLER_OWN GList *owl_message_get_cc_without_recipient(const owl_message *m)
 {
-  char *cc, *shortuser, *recip;
+  char *cc, *shortuser, *recip, *saveptr;
   const char *user;
   GList *out = NULL;
@@ -603 +607 @@
   recip = short_zuser(owl_message_get_recipient(m));
 
-  user = strtok(cc, " ");
+  user = strtok_r(cc, " ", &saveptr);
   while (user != NULL) {
     shortuser = short_zuser(user);
@@ -610 +614 @@
     }
     g_free(shortuser);
-    user = strtok(NULL, " ");
+    user = strtok_r(NULL, " ", &saveptr);
   }
 
@@ -775 +779 @@
   struct hostent *hent;
 #endif /* ZNOTICE_SOCKADDR */
-  char *tmp, *tmp2;
+  /* ctime_r requires a 26-byte buffer */
+  char timestr[26], *tmp, *tmp2;
   int len;
 
@@ -793 +798 @@
   if (m->timestr) g_free(m->timestr);
   m->time = n->z_time.tv_sec;
-  m->timestr = g_strdup(ctime(&m->time));
-  m->timestr[strlen(m->timestr)-1] = '\0';
+  ctime_r(&m->time, timestr);
+  m->timestr = g_strndup(timestr, strlen(timestr) - 1);
 
   /* set other info */

zephyr.c

@@ -284 +284 @@
   FILE *file;
   int fopen_errno;
-  char *tmp, *start;
+  char *tmp, *start, *saveptr;
   char *buffer = NULL;
   char *subsfile;
@@ -319 +319 @@
     
     /* add it to the list of subs */
-    if ((tmp = strtok(start, ",\n\r")) == NULL)
+    if ((tmp = strtok_r(start, ",\n\r", &saveptr)) == NULL)
       continue;
     subs[count].zsub_class = g_strdup(tmp);
-    if ((tmp=strtok(NULL, ",\n\r")) == NULL)
+    if ((tmp = strtok_r(NULL, ",\n\r", &saveptr)) == NULL)
       continue;
     subs[count].zsub_classinst = g_strdup(tmp);
-    if ((tmp = strtok(NULL, " \t\n\r")) == NULL)
+    if ((tmp = strtok_r(NULL, " \t\n\r", &saveptr)) == NULL)
       continue;
     subs[count].zsub_recipient = g_strdup(tmp);