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.
diff --git a/Objects/object.c b/Objects/object.c
index d2aa542..ab10e3e 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -920,6 +920,9 @@
CT 2k0309
modified to restore a possible error.
+
+ CT 2k0325
+ added better safe than sorry check for threadstate
*/
int _PyTrash_delete_nesting = 0;
@@ -930,14 +933,17 @@
PyObject *op;
{
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)
_PyTrash_delete_later = PyList_New(0);
if (_PyTrash_delete_later)
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