Changeset 8377

Timestamp:

May 11, 2009, 4:29:12 PM (14 years ago)

Author:

charles

Message:

(1.5x libT) backport the fix for #2046 - JSON parser doesn't handle floating point numbers right in locales that don't use a period as the decimal point

File:

• branches/1.5x/libtransmission/JSON_parser.c (modified) (2 diffs)

branches/1.5x/libtransmission/JSON_parser.c

@@ -55 +55 @@
 #include <ctype.h>
 #include <float.h>
+#include <locale.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -477 +478 @@
                         value.vu.str.length = jc->parse_buffer_count;
                     } else { 
+                        /* the json spec requires a '.' decimal point regardless of locale */
+                        char numeric[128];
+                        snprintf(numeric, sizeof(numeric), "%s", setlocale(LC_NUMERIC, NULL));
+                        setlocale(LC_NUMERIC, "POSIX" );
                         sscanf(jc->parse_buffer, "%Lf", &value.vu.float_value);
+                        value.vu.float_value = strtod(jc->parse_buffer, NULL);
+                        setlocale(LC_NUMERIC, numeric);
                     }
                     break;