mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 12:44:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 77275 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77275 | mark.dickinson | 2010-01-03 12:03:03 +0000 (Sun, 03 Jan 2010) | 1 line

  Make use of PyLong_AsLongAndOverflow in math_ldexp.
........
This commit is contained in:
Mark Dickinson 2010-01-03 12:16:06 +00:00
parent 479def3fc2
commit fbbb9bdeff
1 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Modules/mathmodule.c
View file

@ -1251,28 +1251,18 @@ math_ldexp(PyObject *self, PyObject *args)
double x, r; double x, r;
PyObject *oexp; PyObject *oexp;
long exp; long exp;
int overflow;
if (! PyArg_ParseTuple(args, "dO:ldexp", &x, &oexp)) if (! PyArg_ParseTuple(args, "dO:ldexp", &x, &oexp))
return NULL; return NULL;
if (PyLong_Check(oexp)) { if (PyLong_Check(oexp)) {
/* on overflow, replace exponent with either LONG_MAX /* on overflow, replace exponent with either LONG_MAX
or LONG_MIN, depending on the sign. */ or LONG_MIN, depending on the sign. */
exp = PyLong_AsLong(oexp); exp = PyLong_AsLongAndOverflow(oexp, &overflow);
if (exp == -1 && PyErr_Occurred()) { 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; return NULL;
} if (overflow)
} exp = overflow < 0 ? LONG_MIN : LONG_MAX;
} }
else { else {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,