From: Eric Smith <eric@trueblade.com>
Date: Wed, 28 Oct 2009 08:44:37 +0000 (+0000)
Subject: Issue 7117: Replace PyOS_ascii_strtod with PyOS_string_to_double in _json.c as part... 
X-Git-Tag: v2.7a1~207
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=129c97df02c7cd42e9c777bd75c6f81655ac024c;p=thirdparty%2FPython%2Fcpython.git

Issue 7117: Replace PyOS_ascii_strtod with PyOS_string_to_double in _json.c as part of short float repr. Change made after consulting with Bob Ippolito. This completes the removal of calls to PyOS_ascii_strtod.
---

diff --git a/Modules/_json.c b/Modules/_json.c
index cfe87087d7f3..7c8abea8f0f2 100644
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -1405,7 +1405,11 @@ _match_number_str(PyScannerObject *s, PyObject *pystr, Py_ssize_t start, Py_ssiz
             rval = PyObject_CallFunctionObjArgs(s->parse_float, numstr, NULL);
         }
         else {
-            rval = PyFloat_FromDouble(PyOS_ascii_atof(PyString_AS_STRING(numstr)));
+            double d = PyOS_string_to_double(PyString_AS_STRING(numstr),
+                                             NULL, NULL);
+            if (d == -1.0 && PyErr_Occurred())
+                return NULL;
+            rval = PyFloat_FromDouble(d);
         }
     }
     else {