From 35f1c9470a28174d2ba0ccf5d2c284d0b5debe39 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Sun, 26 Apr 2009 14:11:18 +0000 Subject: Merged revisions 71963 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r71963 | mark.dickinson | 2009-04-26 15:00:08 +0100 (Sun, 26 Apr 2009) | 2 lines Reset errno before both calls to PyOS_ascii_strtod, not just one. ........ --- Objects/complexobject.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Objects/complexobject.c b/Objects/complexobject.c index 37d9888..acd885b 100644 --- a/Objects/complexobject.c +++ b/Objects/complexobject.c @@ -746,8 +746,6 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v) return NULL; } - errno = 0; - /* position on first nonblank */ start = s; while (*s && isspace(Py_CHARMASK(*s))) @@ -782,6 +780,7 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v) */ /* first look for forms starting with */ + errno = 0; z = PyOS_ascii_strtod(s, &end); if (end == s && errno == ENOMEM) return PyErr_NoMemory(); @@ -794,6 +793,7 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v) if (*s == '+' || *s == '-') { /* j | j */ x = z; + errno = 0; y = PyOS_ascii_strtod(s, &end); if (end == s && errno == ENOMEM) return PyErr_NoMemory(); -- cgit v0.12