Changeset 13918

Timestamp:

Feb 1, 2013, 6:45:23 PM (9 years ago)

Author:

jordan

Message:

(2.7x) #5249 'error parsing json in locales that use , as a decimal separator': backport unit tests and fix from trunk.

Location:

branches/2.7x/libtransmission

Files:

• bencode.c (modified) (2 diffs)
• json-test.c (modified) (1 diff)
• json.c (modified) (2 diffs)

branches/2.7x/libtransmission/bencode.c

@@ -1622 +1622 @@
 {
     struct evbuffer * buf = evbuffer_new ();
+    char lc_numeric[128];
+
+    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 */
@@ -1644 +1648 @@
     }
 
+    setlocale (LC_NUMERIC, lc_numeric);
     return buf;
 }

branches/2.7x/libtransmission/json-test.c

@@ -213 +213 @@
 main (void)
 {
-    const testFunc tests[] = { test_elements,
-                               test_utf8,
-                               test1,
-                               test2,
-                               test3,
-                               test_unescape };
-
-    return runTests (tests, NUM_TESTS (tests));
-}
+  int i;
+  int n;
+  int rv;
+
+  const char * comma_locales[] = { "da_DK.UTF-8",
+                                   "fr_FR.UTF-8",
+                                   "ru_RU.UTF-8"};
+
+  const testFunc tests[] = { test_elements,
+                             test_utf8,
+                             test1,
+                             test2,
+                             test3,
+                             test_unescape };
+
+  /* run the tests in a locale with a decimal point of '.' */
+  setlocale (LC_NUMERIC, "C");
+  if ((rv = runTests (tests, NUM_TESTS (tests))))
+    return rv;
+
+  /* run the tests in a locale with a decimal point of ',' */
+  n = sizeof(comma_locales) / sizeof(comma_locales[0]);
+  for (i=0; i<n; ++i)
+    if (setlocale (LC_NUMERIC, comma_locales[i]) != NULL)
+      break;
+  if (i==n)
+    fprintf (stderr, "WARNING: unable to run locale-specific json tests. add a locale like %s or %s\n",
+             comma_locales[0],
+             comma_locales[1]);
+  else if ((rv = runTests (tests, NUM_TESTS(tests))))
+    return rv;
+
+  /* success */
+  return 0;
+}

branches/2.7x/libtransmission/json.c

@@ -280 +280 @@
   jsonsl_t jsn;
   struct json_wrapper_data data;
+  char lc_numeric[128];
+
+  tr_strlcpy (lc_numeric, setlocale (LC_NUMERIC, NULL), sizeof (lc_numeric));
+  setlocale (LC_NUMERIC, "C");
 
   jsn = jsonsl_new (MAX_DEPTH);
@@ -310 +314 @@
   tr_ptrArrayDestruct (&data.stack, NULL);
   jsonsl_destroy (jsn);
+  setlocale (LC_NUMERIC, lc_numeric);
   return error;
 }