diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-07-31 22:56:02 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-07-31 22:56:02 (GMT) |
| commit | e19cadb427b6910930b50584bd9066ab5b198300 (patch) | |
| tree | 318d34b82b72e35bfcf4df07991ca22efa58c730 /Python/errors.c | |
| parent | a986dfa927017d23c73c703ba848bd86b4424437 (diff) | |
| download | cpython-e19cadb427b6910930b50584bd9066ab5b198300.zip cpython-e19cadb427b6910930b50584bd9066ab5b198300.tar.gz cpython-e19cadb427b6910930b50584bd9066ab5b198300.tar.bz2 | |
Correct one of the "MemoryError oddities":
the traceback would grow each time a MemoryError is raised.
Diffstat (limited to 'Python/errors.c')
| -rw-r--r-- | Python/errors.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Python/errors.c b/Python/errors.c index a06ec02..5ee6255 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -321,7 +321,17 @@ PyErr_NoMemory(void) /* raise the pre-allocated instance if it still exists */ if (PyExc_MemoryErrorInst) + { + /* Clear the previous traceback, otherwise it will be appended + * to the current one. + * + * The following statement is not likely to raise any error; + * if it does, we simply discard it. + */ + PyException_SetTraceback(PyExc_MemoryErrorInst, Py_None); + PyErr_SetObject(PyExc_MemoryError, PyExc_MemoryErrorInst); + } else /* this will probably fail since there's no memory and hee, hee, we have to instantiate this class |