Issue #20437: Fixed 22 potential bugs when deleting objects references.

2014-02-09 13:46:20 +02:00
parent 2623c8c23c 505ff755d7
commit dfe98a102e
15 changed files with 34 additions and 63 deletions
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -430,8 +430,7 @@ trace_trampoline(PyObject *self, PyFrameObject *frame,
    result = call_trampoline(callback, frame, what, arg);
    if (result == NULL) {
        PyEval_SetTrace(NULL, NULL);
-        Py_XDECREF(frame->f_trace);
-        frame->f_trace = NULL;
+        Py_CLEAR(frame->f_trace);
        return -1;
    }
    if (result != Py_None) {