mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-19 23:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merged revisions 76916 via svnmerge from

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

........
  r76916 | mark.dickinson | 2009-12-20 13:58:18 +0000 (Sun, 20 Dec 2009) | 3 lines

  math.factorial depends on PyLong_AsLong correctly converting floats; rewrite
  it to do the conversion explicitly instead.  See issue #7550.
........
This commit is contained in:
Mark Dickinson 2009-12-20 14:07:47 +00:00
parent a8f6f1e2d6
commit da39dbffb6
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Modules/mathmodule.c
View file

@ -1137,15 +1137,22 @@ math_factorial(PyObject *self, PyObject *arg)
PyObject *result, *iobj, *newresult; PyObject *result, *iobj, *newresult;
if (PyFloat_Check(arg)) { if (PyFloat_Check(arg)) {
PyObject *lx;
double dx = PyFloat_AS_DOUBLE((PyFloatObject *)arg); double dx = PyFloat_AS_DOUBLE((PyFloatObject *)arg);
if (dx != floor(dx)) { if (!(Py_IS_FINITE(dx) && dx == floor(dx))) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"factorial() only accepts integral values"); "factorial() only accepts integral values");
return NULL; return NULL;
} }
lx = PyLong_FromDouble(dx);
if (lx == NULL)
return NULL;
x = PyLong_AsLong(lx);
Py_DECREF(lx);
} }
else
x = PyLong_AsLong(arg);
x = PyLong_AsLong(arg);
if (x == -1 && PyErr_Occurred()) if (x == -1 && PyErr_Occurred())
return NULL; return NULL;
if (x < 0) { if (x < 0) {