Issue #23783: Fixed memory leak in PyObject_ClearWeakRefs() in case of

serhiy-storchaka · serhiy-storchaka · commit be1c60c3f68a · 2015-03-30T09:52:53.000+03:00
MemoryError.
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
@@ -900,11 +900,9 @@ PyObject_ClearWeakRefs(PyObject *object)
     if (*list != NULL) {
         PyWeakReference *current = *list;
         Py_ssize_t count = _PyWeakref_GetWeakrefCount(current);
-        int restore_error = PyErr_Occurred() ? 1 : 0;
         PyObject *err_type, *err_value, *err_tb;
 
-        if (restore_error)
-            PyErr_Fetch(&err_type, &err_value, &err_tb);
+        PyErr_Fetch(&err_type, &err_value, &err_tb);
         if (count == 1) {
             PyObject *callback = current->wr_callback;
 
@@ -922,8 +920,7 @@ PyObject_ClearWeakRefs(PyObject *object)
 
             tuple = PyTuple_New(count * 2);
             if (tuple == NULL) {
-                if (restore_error)
-                    PyErr_Fetch(&err_type, &err_value, &err_tb);
+                _PyErr_ChainExceptions(err_type, err_value, err_tb);
                 return;
             }
 
@@ -954,7 +951,7 @@ PyObject_ClearWeakRefs(PyObject *object)
             }
             Py_DECREF(tuple);
         }
-        if (restore_error)
-            PyErr_Restore(err_type, err_value, err_tb);
+        assert(!PyErr_Occurred());
+        PyErr_Restore(err_type, err_value, err_tb);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -900,11 +900,9 @@ PyObject_ClearWeakRefs(PyObject *object)`
`900`	`900`	`if (*list != NULL) {`
`901`	`901`	`PyWeakReference current = list;`
`902`	`902`	`Py_ssize_t count = _PyWeakref_GetWeakrefCount(current);`
`903`		`- int restore_error = PyErr_Occurred() ? 1 : 0;`
`904`	`903`	`PyObject err_type, err_value, *err_tb;`
`905`	`904`
`906`		`- if (restore_error)`
`907`		`- PyErr_Fetch(&err_type, &err_value, &err_tb);`
	`905`	`+ PyErr_Fetch(&err_type, &err_value, &err_tb);`
`908`	`906`	`if (count == 1) {`
`909`	`907`	`PyObject *callback = current->wr_callback;`
`910`	`908`
`@@ -922,8 +920,7 @@ PyObject_ClearWeakRefs(PyObject *object)`
`922`	`920`
`923`	`921`	`tuple = PyTuple_New(count * 2);`
`924`	`922`	`if (tuple == NULL) {`
`925`		`- if (restore_error)`
`926`		`- PyErr_Fetch(&err_type, &err_value, &err_tb);`
	`923`	`+ _PyErr_ChainExceptions(err_type, err_value, err_tb);`
`927`	`924`	`return;`
`928`	`925`	`}`
`929`	`926`
`@@ -954,7 +951,7 @@ PyObject_ClearWeakRefs(PyObject *object)`
`954`	`951`	`}`
`955`	`952`	`Py_DECREF(tuple);`
`956`	`953`	`}`
`957`		`- if (restore_error)`
`958`		`- PyErr_Restore(err_type, err_value, err_tb);`
	`954`	`+ assert(!PyErr_Occurred());`
	`955`	`+ PyErr_Restore(err_type, err_value, err_tb);`
`959`	`956`	`}`
`960`	`957`	`}`