Skip to content

bpo-33622: Add checks for exceptions leaks in the garbage collector. #7126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 3 commits into from
May 29, 2018
Merged

bpo-33622: Add checks for exceptions leaks in the garbage collector. #7126

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27f2b83
bpo-33622: Add checks for exceptions leaks in the garbage collector.
serhiy-storchaka May 24, 2018
032a0ba
Address review comments.
serhiy-storchaka May 28, 2018
8de8f20
Check and silence errors in tp_clear.
serhiy-storchaka May 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address review comments.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed May 28, 2018
commit 032a0ba7bbfb4bf4849daa701e1dfbf027385f9e
5 changes: 4 additions & 1 deletion Modules/gcmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,7 @@ handle_legacy_finalizers(PyGC_Head *finalizers, PyGC_Head *old)
{
PyGC_Head *gc = finalizers->gc.gc_next;

assert(!PyErr_Occurred());
if (_PyRuntime.gc.garbage == NULL) {
_PyRuntime.gc.garbage = PyList_New(0);
if (_PyRuntime.gc.garbage == NULL)
Expand Down Expand Up @@ -751,6 +752,7 @@ delete_garbage(PyGC_Head *collectable, PyGC_Head *old)
{
inquiry clear;

assert(!PyErr_Occurred());
while (!gc_list_is_empty(collectable)) {
PyGC_Head *gc = collectable->gc.gc_next;
PyObject *op = FROM_GC(gc);
Expand Down Expand Up @@ -1034,9 +1036,11 @@ static Py_ssize_t
collect_with_callback(int generation)
{
Py_ssize_t result, collected, uncollectable;
assert(!PyErr_Occurred());
invoke_gc_callback("start", generation, 0, 0);
result = collect(generation, &collected, &uncollectable, 0);
invoke_gc_callback("stop", generation, collected, uncollectable);
assert(!PyErr_Occurred());
return result;
}

Expand Down Expand Up @@ -1137,7 +1141,6 @@ gc_collect_impl(PyObject *module, int generation)
n = 0; /* already collecting, don't do anything */
else {
_PyRuntime.gc.collecting = 1;
assert(!PyErr_Occurred());
n = collect_with_callback(generation);
_PyRuntime.gc.collecting = 0;
}
Expand Down