Changeset 5458

Timestamp:

Oct 13, 2016 4:32:29 AM (8 years ago)

Author:

riza

Message:

Re #1945 (misc): Use localtime_r() instead of localtime() (if available) since localtime() is not thread safe.
This fixes a data race in pj_time_decode() which is called from multiple threads.
Thanks to Kal (b17 c0de) for the patch.

Location:

pjproject/trunk

Files:

• aconfigure (modified) (1 diff)
• aconfigure.ac (modified) (1 diff)
• pjlib/include/pj/compat/os_auto.h.in (modified) (1 diff)
• pjlib/include/pj/compat/os_darwinos.h (modified) (1 diff)
• pjlib/include/pj/compat/os_linux.h (modified) (1 diff)
• pjlib/src/pj/os_time_common.c (modified) (1 diff)

pjproject/trunk/aconfigure

@@ -5415 +5415 @@
 
 
+ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r"
+if test "x$ac_cv_func_localtime_r" = xyes; then :
+  $as_echo "#define PJ_HAS_LOCALTIME_R 1" >>confdefs.h
+
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting PJ_OS_NAME to $target" >&5
 $as_echo "Setting PJ_OS_NAME to $target" >&6; }

pjproject/trunk/aconfigure.ac

@@ -266 +266 @@
                   #endif
                  ])
+
+AC_CHECK_FUNC(localtime_r,[AC_DEFINE(PJ_HAS_LOCALTIME_R,1)])
+
 AC_MSG_RESULT([Setting PJ_OS_NAME to $target])
 AC_DEFINE_UNQUOTED(PJ_OS_NAME,["$target"])

pjproject/trunk/pjlib/include/pj/compat/os_auto.h.in

@@ -167 +167 @@
 #endif
 
+/* Is localtime_r() available? */
+#undef PJ_HAS_LOCALTIME_R
+
 /* Unicode? */
 #undef PJ_NATIVE_STRING_IS_UNICODE

pjproject/trunk/pjlib/include/pj/compat/os_darwinos.h

@@ -55 +55 @@
 #define PJ_HAS_WINSOCK_H            0
 #define PJ_HAS_WINSOCK2_H           0
+
+#define PJ_HAS_LOCALTIME_R          1
 
 /* Is errno a good way to retrieve OS errors?

pjproject/trunk/pjlib/include/pj/compat/os_linux.h

@@ -55 +55 @@
 #define PJ_HAS_WINSOCK_H            0
 #define PJ_HAS_WINSOCK2_H           0
+
+#define PJ_HAS_LOCALTIME_R          1
 
 #define PJ_SOCK_HAS_INET_ATON       1

pjproject/trunk/pjlib/src/pj/os_time_common.c

@@ -29 +29 @@
 PJ_DEF(pj_status_t) pj_time_decode(const pj_time_val *tv, pj_parsed_time *pt)
 {
-    struct tm *local_time;
+    struct tm local_time;
 
     PJ_CHECK_STACK();
 
-    local_time = localtime((time_t*)&tv->sec);
+#if defined(PJ_HAS_LOCALTIME_R) && PJ_HAS_LOCALTIME_R != 0
+    localtime_r((time_t*)&tv->sec, &local_time);
+#else
+    /* localtime() is NOT thread-safe. */
+    local_time = *localtime((time_t*)&tv->sec);
+#endif
 
-    pt->year = local_time->tm_year+1900;
-    pt->mon = local_time->tm_mon;
-    pt->day = local_time->tm_mday;
-    pt->hour = local_time->tm_hour;
-    pt->min = local_time->tm_min;
-    pt->sec = local_time->tm_sec;
-    pt->wday = local_time->tm_wday;
+    pt->year = local_time.tm_year+1900;
+    pt->mon = local_time.tm_mon;
+    pt->day = local_time.tm_mday;
+    pt->hour = local_time.tm_hour;
+    pt->min = local_time.tm_min;
+    pt->sec = local_time.tm_sec;
+    pt->wday = local_time.tm_wday;
     pt->msec = tv->msec;