Changeset 14533

Timestamp:

Jun 1, 2015, 5:25:14 AM (6 years ago)

Author:

mikedld

Message:

#5851: Use per-thread locale setup if possible

This prevents crashes on concurrent tr_variantFromBuf, tr_variantToBuf
and tr_variantGetReal use.

Location:

trunk

Files:

• CMakeLists.txt (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• libtransmission/variant.c (modified) (8 diffs)

trunk/CMakeLists.txt

@@ -382 +382 @@
     stdbool.h
     sys/statvfs.h
-    xfs/xfs.h)
+    xfs/xfs.h
+    xlocale.h)
 
 if(ENABLE_NLS)
@@ -417 +418 @@
     strsep
     syslog
+    uselocale
     valloc)
 

trunk/configure.ac

@@ -107 +107 @@
 AC_HEADER_TIME
 
-AC_CHECK_HEADERS([stdbool.h])
-AC_CHECK_FUNCS([iconv_open pread pwrite lrintf strlcpy daemon dirname basename canonicalize_file_name strcasecmp localtime_r fallocate64 posix_fallocate memmem strsep strtold syslog valloc getpagesize posix_memalign statvfs htonll ntohll mkdtemp])
+AC_CHECK_HEADERS([stdbool.h xlocale.h])
+AC_CHECK_FUNCS([iconv_open pread pwrite lrintf strlcpy daemon dirname basename canonicalize_file_name strcasecmp localtime_r fallocate64 posix_fallocate memmem strsep strtold syslog valloc getpagesize posix_memalign statvfs htonll ntohll mkdtemp uselocale])
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET

trunk/libtransmission/variant.c

@@ -8 +8 @@
  */
 
+#if defined (HAVE_USELOCALE) && (!defined (_XOPEN_SOURCE) || _XOPEN_SOURCE < 700)
+ #undef _XOPEN_SOURCE
+ #define _XOPEN_SOURCE 700
+#endif
+
+#if defined (HAVE_USELOCALE) && !defined (_GNU_SOURCE)
+ #define _GNU_SOURCE
+#endif
+
 #include <assert.h>
 #include <errno.h>
@@ -18 +27 @@
 
 #include <locale.h> /* setlocale() */
+
+#if defined (HAVE_USELOCALE) && defined (HAVE_XLOCALE_H)
+ #include <xlocale.h>
+#endif
 
 #include <event2/buffer.h>
@@ -35 +48 @@
 **/
 
+struct locale_context
+{
+#ifdef HAVE_USELOCALE
+  locale_t new_locale;
+  locale_t old_locale;
+#else
+#ifdef _WIN32
+  int old_thread_config;
+#endif
+  int category;
+  char old_locale[128];
+#endif
+};
+
+static void
+use_numeric_locale (struct locale_context * context,
+                    const char            * locale_name)
+{
+#ifdef HAVE_USELOCALE
+
+  context->new_locale = newlocale (LC_NUMERIC_MASK, locale_name, NULL);
+  context->old_locale = uselocale (context->new_locale);
+
+#else
+
+#ifdef _WIN32
+  context->old_thread_config = _configthreadlocale (_ENABLE_PER_THREAD_LOCALE);
+#endif
+
+  context->category = LC_NUMERIC;
+  tr_strlcpy (context->old_locale, setlocale (context->category, NULL), sizeof (context->old_locale));
+  setlocale (context->category, locale_name);
+
+#endif
+}
+
+static void
+restore_locale (struct locale_context * context)
+{
+#ifdef HAVE_USELOCALE
+
+  uselocale (context->old_locale);
+  freelocale (context->new_locale);
+
+#else
+
+  setlocale (context->category, context->old_locale);
+
+#ifdef _WIN32
+  _configthreadlocale (context->old_thread_config);
+#endif
+
+#endif
+}
+
+/***
+****
+***/
+
 static bool
 tr_variantIsContainer (const tr_variant * v)
@@ -302 +374 @@
     {
       char * endptr;
-      char locale[128];
+      struct locale_context locale_ctx;
       double d;
 
       /* the json spec requires a '.' decimal point regardless of locale */
-      tr_strlcpy (locale, setlocale (LC_NUMERIC, NULL), sizeof (locale));
-      setlocale (LC_NUMERIC, "POSIX");
+      use_numeric_locale (&locale_ctx, "C");
       d  = strtod (getStr (v), &endptr);
-      setlocale (LC_NUMERIC, locale);
+      restore_locale (&locale_ctx);
 
       if ((success = (getStr (v) != endptr) && !*endptr))
@@ -1094 +1165 @@
 tr_variantToBuf (const tr_variant * v, tr_variant_fmt fmt)
 {
-  char lc_numeric[128];
+  struct locale_context locale_ctx;
   struct evbuffer * buf = evbuffer_new();
 
   /* parse with LC_NUMERIC="C" to ensure a "." decimal separator */
-  tr_strlcpy (lc_numeric, setlocale (LC_NUMERIC, NULL), sizeof (lc_numeric));
-  setlocale (LC_NUMERIC, "C");
+  use_numeric_locale (&locale_ctx, "C");
 
   evbuffer_expand (buf, 4096); /* alloc a little memory to start off with */
@@ -1119 +1189 @@
 
   /* restore the previous locale */
-  setlocale (LC_NUMERIC, lc_numeric);
+  restore_locale (&locale_ctx);
   return buf;
 }
@@ -1252 +1322 @@
 {
   int err;
-  char lc_numeric[128];
+  struct locale_context locale_ctx;
 
   /* parse with LC_NUMERIC="C" to ensure a "." decimal separator */
-  tr_strlcpy (lc_numeric, setlocale (LC_NUMERIC, NULL), sizeof (lc_numeric));
-  setlocale (LC_NUMERIC, "C");
+  use_numeric_locale (&locale_ctx, "C");
 
   switch (fmt)
@@ -1271 +1340 @@
 
   /* restore the previous locale */
-  setlocale (LC_NUMERIC, lc_numeric);
+  restore_locale (&locale_ctx);
   return err;
 }