Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Christian Tismer: 

Added "better safe than sorry" patch to the new
trashcan code in object.c, to ensure that tstate
is not touched when it might be undefined.
This commit is contained in:
Guido van Rossum 2000-03-25 18:39:19 +00:00
parent d8855fde88
commit 13ff8eb493
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Objects/object.c
View File

@ -920,6 +920,9 @@ Py_ReprLeave(obj)
CT 2k0309 CT 2k0309
modified to restore a possible error. modified to restore a possible error.
CT 2k0325
added better safe than sorry check for threadstate
*/ */
int _PyTrash_delete_nesting = 0; int _PyTrash_delete_nesting = 0;
@ -930,14 +933,17 @@ _PyTrash_deposit_object(op)
PyObject *op; PyObject *op;
{ {
PyObject *error_type, *error_value, *error_traceback; PyObject *error_type, *error_value, *error_traceback;
PyErr_Fetch(&error_type, &error_value, &error_traceback);
if (PyThreadState_GET() != NULL)
PyErr_Fetch(&error_type, &error_value, &error_traceback);
if (!_PyTrash_delete_later) if (!_PyTrash_delete_later)
_PyTrash_delete_later = PyList_New(0); _PyTrash_delete_later = PyList_New(0);
if (_PyTrash_delete_later) if (_PyTrash_delete_later)
PyList_Append(_PyTrash_delete_later, (PyObject *)op); PyList_Append(_PyTrash_delete_later, (PyObject *)op);
PyErr_Restore(error_type, error_value, error_traceback); if (PyThreadState_GET() != NULL)
PyErr_Restore(error_type, error_value, error_traceback);
} }
void void