From 97be1ca1d9f385996e11cf157b3348392266e778 Mon Sep 17 00:00:00 2001 From: Eric Smith Date: Tue, 27 Oct 2009 11:32:11 +0000 Subject: Issue 7117: Replace PyOS_ascii_strtod with PyOS_string_to_double in cPickle as part of short float repr. --- Modules/cPickle.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Modules/cPickle.c b/Modules/cPickle.c index a2261cc..ab59b76 100644 --- a/Modules/cPickle.c +++ b/Modules/cPickle.c @@ -3552,11 +3552,11 @@ load_float(Unpicklerobject *self) if (len < 2) return bad_readline(); if (!( s=pystrndup(s,len))) return -1; - errno = 0; - d = PyOS_ascii_strtod(s, &endptr); + d = PyOS_string_to_double(s, &endptr, PyExc_OverflowError); - if ((errno == ERANGE && !(fabs(d) <= 1.0)) || - (endptr[0] != '\n') || (endptr[1] != '\0')) { + if (d == -1.0 && PyErr_Occurred()) { + goto finally; + } else if ((endptr[0] != '\n') || (endptr[1] != '\0')) { PyErr_SetString(PyExc_ValueError, "could not convert string to float"); goto finally; -- cgit v0.12