From da39dbffb625b3c527d18de31a2a7bcbc7d1679c Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Sun, 20 Dec 2009 14:07:47 +0000 Subject: [PATCH] Merged revisions 76916 via svnmerge from 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. ........ --- Modules/mathmodule.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c index f835005f754..92f5f42ece9 100644 --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -1137,15 +1137,22 @@ math_factorial(PyObject *self, PyObject *arg) PyObject *result, *iobj, *newresult; if (PyFloat_Check(arg)) { + PyObject *lx; double dx = PyFloat_AS_DOUBLE((PyFloatObject *)arg); - if (dx != floor(dx)) { + if (!(Py_IS_FINITE(dx) && dx == floor(dx))) { PyErr_SetString(PyExc_ValueError, "factorial() only accepts integral values"); 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()) return NULL; if (x < 0) {