diff options
| author | Riza Sulistyo <riza@teluu.com> | 2016-10-13 04:32:29 +0000 |
|---|---|---|
| committer | Riza Sulistyo <riza@teluu.com> | 2016-10-13 04:32:29 +0000 |
| commit | 4412f8cdfdab2c140f70e10e0932a30c5091373b (patch) | |
| tree | 0eb2b2fc7b9d1bffe8a2ac031180e187e1be0666 /pjlib/include/pj | |
| parent | 94144542bbf37dd74b10865a4125ddaf9c119068 (diff) | |
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.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5458 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/include/pj')
| -rw-r--r-- | pjlib/include/pj/compat/os_auto.h.in | 3 | ||||
| -rw-r--r-- | pjlib/include/pj/compat/os_darwinos.h | 2 | ||||
| -rw-r--r-- | pjlib/include/pj/compat/os_linux.h | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/pjlib/include/pj/compat/os_auto.h.in b/pjlib/include/pj/compat/os_auto.h.in index 7eb89562..70018ba6 100644 --- a/pjlib/include/pj/compat/os_auto.h.in +++ b/pjlib/include/pj/compat/os_auto.h.in @@ -166,6 +166,9 @@ # define PJ_OS_HAS_CHECK_STACK 0 #endif +/* Is localtime_r() available? */ +#undef PJ_HAS_LOCALTIME_R + /* Unicode? */ #undef PJ_NATIVE_STRING_IS_UNICODE diff --git a/pjlib/include/pj/compat/os_darwinos.h b/pjlib/include/pj/compat/os_darwinos.h index 8cccd425..98435a8b 100644 --- a/pjlib/include/pj/compat/os_darwinos.h +++ b/pjlib/include/pj/compat/os_darwinos.h @@ -55,6 +55,8 @@ #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? */ #define PJ_HAS_ERRNO_VAR 1 diff --git a/pjlib/include/pj/compat/os_linux.h b/pjlib/include/pj/compat/os_linux.h index 40840e25..c33f2c19 100644 --- a/pjlib/include/pj/compat/os_linux.h +++ b/pjlib/include/pj/compat/os_linux.h @@ -55,6 +55,8 @@ #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 /* Set 1 if native sockaddr_in has sin_len member. |