diff options
| author | Mark Dickinson <mdickinson@enthought.com> | 2012-10-25 09:46:28 (GMT) |
|---|---|---|
| committer | Mark Dickinson <mdickinson@enthought.com> | 2012-10-25 09:46:28 (GMT) |
| commit | 76464494bc1a6779cc4839a28238fb7ea4104a5a (patch) | |
| tree | 420dc4593bc35c2ecd6611059c38f050375151ba | |
| parent | 837cd06d36f7e69fc51e5bce7631041161f9b864 (diff) | |
| download | cpython-76464494bc1a6779cc4839a28238fb7ea4104a5a.zip cpython-76464494bc1a6779cc4839a28238fb7ea4104a5a.tar.gz cpython-76464494bc1a6779cc4839a28238fb7ea4104a5a.tar.bz2 | |
Fix math.factorial KeyboardInterrupt segfault. Thanks Amaury for report and diagnosis.
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/mathmodule.c | 7 |
2 files changed, 6 insertions, 4 deletions
@@ -132,6 +132,9 @@ Core and Builtins Library ------- +- Issue #16305: Fix a segmentation fault occurring when interrupting + math.factorial. + - Issue #14398: Fix size truncation and overflow bugs in the bz2 module. - Issue #16220: wsgiref now always calls close() on an iterable response. diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c index 2c4cc73..142eca4 100644 --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -1330,14 +1330,13 @@ factorial_odd_part(unsigned long n) Py_DECREF(outer); outer = tmp; } - - goto done; + Py_DECREF(inner); + return outer; error: Py_DECREF(outer); - done: Py_DECREF(inner); - return outer; + return NULL; } /* Lookup table for small factorial values */ |