mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 02:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merged revisions 85896 via svnmerge from

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

........
  r85896 | antoine.pitrou | 2010-10-29 00:56:58 +0200 (ven., 29 oct. 2010) | 4 lines

  Issue #5437: A preallocated MemoryError instance should not hold traceback
  data (including local variables caught in the stack trace) alive infinitely.
........
This commit is contained in:
Antoine Pitrou 2010-10-28 23:06:57 +00:00
parent d7a3ab962b
commit 98e2b45297
5 changed files with 132 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Python/errors.c
View file

@ -328,29 +328,7 @@ PyErr_BadArgument(void)
PyObject *
PyErr_NoMemory(void)
{
if (PyErr_ExceptionMatches(PyExc_MemoryError))
/* already current */
return NULL;
/* 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
*/
PyErr_SetNone(PyExc_MemoryError);
PyErr_SetNone(PyExc_MemoryError);
return NULL;
}