Changeset ee6b30f for zephyr.c

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>

File:

• zephyr.c (modified) (2 diffs)

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);