Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix refleak introduced by 4f730c045f5f (issue #18408) and unveiled by 95eea8624d05 (issue #16596).

Browse source
This commit is contained in:
Antoine Pitrou 2013-11-23 14:05:23 +01:00
parent 72d28500b3
commit 8933521b3d
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Python/ceval.c
View file

@ -3850,20 +3850,16 @@ call_exc_trace(Py_tracefunc func, PyObject *self, PyFrameObject *f)
{ {
PyObject *type, *value, *traceback, *orig_traceback, *arg; PyObject *type, *value, *traceback, *orig_traceback, *arg;
int err; int err;
PyErr_Fetch(&type, &value, &traceback); PyErr_Fetch(&type, &value, &orig_traceback);
if (value == NULL) { if (value == NULL) {
value = Py_None; value = Py_None;
Py_INCREF(value); Py_INCREF(value);
} }
PyErr_NormalizeException(&type, &value, &traceback); PyErr_NormalizeException(&type, &value, &orig_traceback);
orig_traceback = traceback; traceback = (orig_traceback != NULL) ? orig_traceback : Py_None;
if (traceback == NULL) {
Py_INCREF(Py_None);
traceback = Py_None;
}
arg = PyTuple_Pack(3, type, value, traceback); arg = PyTuple_Pack(3, type, value, traceback);
if (arg == NULL) { if (arg == NULL) {
PyErr_Restore(type, value, traceback); PyErr_Restore(type, value, orig_traceback);
return; return;
} }
err = call_trace(func, self, f, PyTrace_EXCEPTION, arg); err = call_trace(func, self, f, PyTrace_EXCEPTION, arg);