diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2010-01-03 12:03:03 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2010-01-03 12:03:03 (GMT) |
| commit | f132c16199788bb83f2a7409bbc6febb8ec606c6 (patch) | |
| tree | 072419b56f69b8893a4be0d47ee1711094739d49 /Modules | |
| parent | 722a8a95b774073eafabd5dbe69c864b28e76c8d (diff) | |
| download | cpython-f132c16199788bb83f2a7409bbc6febb8ec606c6.zip cpython-f132c16199788bb83f2a7409bbc6febb8ec606c6.tar.gz cpython-f132c16199788bb83f2a7409bbc6febb8ec606c6.tar.bz2 | |
Make use of PyLong_AsLongAndOverflow in math_ldexp.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/mathmodule.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c index 849f7f0..2dd7a66 100644 --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -1175,31 +1175,18 @@ math_ldexp(PyObject *self, PyObject *args) double x, r; PyObject *oexp; long exp; + int overflow; if (! PyArg_ParseTuple(args, "dO:ldexp", &x, &oexp)) return NULL; - if (PyLong_Check(oexp)) { + if (PyLong_Check(oexp) || PyInt_Check(oexp)) { /* on overflow, replace exponent with either LONG_MAX or LONG_MIN, depending on the sign. */ - exp = PyLong_AsLong(oexp); - if (exp == -1 && PyErr_Occurred()) { - if (PyErr_ExceptionMatches(PyExc_OverflowError)) { - if (Py_SIZE(oexp) < 0) { - exp = LONG_MIN; - } - else { - exp = LONG_MAX; - } - PyErr_Clear(); - } - else { - /* propagate any unexpected exception */ - return NULL; - } - } - } - else if (PyInt_Check(oexp)) { - exp = PyInt_AS_LONG(oexp); + exp = PyLong_AsLongAndOverflow(oexp, &overflow); + if (exp == -1 && PyErr_Occurred()) + return NULL; + if (overflow) + exp = overflow < 0 ? LONG_MIN : LONG_MAX; } else { PyErr_SetString(PyExc_TypeError, |