Changeset 13861

Timestamp:

Jan 24, 2013, 4:33:49 PM (8 years ago)

Author:

jordan

Message:

(libT) #5249 'error parsing json in some locales': fix the bug; the new locale unit tests in json-test pass now

Location:

trunk/libtransmission

Files:

• json-test.c (modified) (3 diffs)
• variant.c (modified) (6 diffs)

trunk/libtransmission/json-test.c

@@ -227 +227 @@
   int n;
   int rv;
-  char lc_numeric[128];
-  const char * comma_locales[] = { "da_DK.UTF-8", "fr_FR.UTF-8", "ru_RU.UTF-8"};
+
+  const char * comma_locales[] = { "da_DK.UTF-8",
+                                   "fr_FR.UTF-8",
+                                   "ru_RU.UTF-8"};
 
   const testFunc tests[] = { test_elements,
@@ -238 +240 @@
 
   /* run the tests in a locale with a decimal point of '.' */
-  tr_strlcpy (lc_numeric, setlocale (LC_NUMERIC, NULL), sizeof (lc_numeric));
   setlocale (LC_NUMERIC, "C");
   if ((rv = runTests (tests, NUM_TESTS (tests))))
@@ -252 +253 @@
   else if ((rv = runTests (tests, NUM_TESTS(tests))))
     return rv;
-  setlocale (LC_NUMERIC, lc_numeric);
 
   /* success */

trunk/libtransmission/variant.c

@@ -802 +802 @@
   int stackSize = 0;
   int stackAlloc = 64;
-  char lc_numeric[128];
   struct SaveNode * stack = tr_new (struct SaveNode, stackAlloc);
-
-  /* always use a '.' decimal point s.t. locale-hopping doesn't bite us */
-  tr_strlcpy (lc_numeric, setlocale (LC_NUMERIC, NULL), sizeof (lc_numeric));
-  setlocale (LC_NUMERIC, "C");
 
   nodeConstruct (&stack[stackSize++], v, sort_dicts);
@@ -898 +893 @@
         }
     }
-
-  /* restore the locale... */
-  setlocale (LC_NUMERIC, lc_numeric);
 
   tr_free (stack);
@@ -1096 +1088 @@
 tr_variantToBuf (const tr_variant * v, tr_variant_fmt fmt)
 {
+  char lc_numeric[128];
   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");
 
   evbuffer_expand (buf, 4096); /* alloc a little memory to start off with */
@@ -1115 +1112 @@
     }
 
+  /* restore the previous locale */
+  setlocale (LC_NUMERIC, lc_numeric);
   return buf;
 }
@@ -1262 +1261 @@
 {
   int err;
+  char lc_numeric[128];
+
+  /* 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");
 
   switch (fmt)
@@ -1275 +1279 @@
     }
 
+  /* restore the previous locale */
+  setlocale (LC_NUMERIC, lc_numeric);
   return err;
 }