E5E7 bpo-41422: Visit the Unpickler's memo in Unpickler_traverse by kale-smoothie · Pull Request #21664 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-41422: Visit the Unpickler's memo in Unpickler_traverse #21664

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 5 commits into from
Nov 27, 2023
Merged

bpo-41422: Visit the Unpickler's memo in Unpickler_traverse #21664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2251347
Visit the Unpickler's memo in Unpickler_traverse.
kale-smoothie Jul 28, 2020
29fb997
Add news item for bpo-41422.
kale-smoothie Jul 28, 2020
d755d2e
Merge branch 'main' into fix-issue41422
serhiy-storchaka Nov 27, 2023
3af4e7b
Fix also Pickler.
serhiy-storchaka Nov 27, 2023
16bb762
Merge branch 'main' into fix-issue41422
serhiy-storchaka Nov 27, 2023
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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2020-07-28-20-48-05.bpo-41422.iMwnMu.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixed memory leaks of :class:`pickle.Pickler` and :class:`pickle.Unpickler` involving cyclic references via the
internal memo mapping.
15 changes: 15 additions & 0 deletions Modules/_pickle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4707,6 +4707,14 @@ Pickler_traverse(PicklerObject *self, visitproc visit, void *arg)
Py_VISIT(self->fast_memo);
Py_VISIT(self->reducer_override);
Py_VISIT(self->buffer_callback);
PyMemoTable *memo = self->memo;
if (memo && memo->mt_table) {
Py_ssize_t i = memo->mt_allocated;
while (--i >= 0) {
Py_VISIT(memo->mt_table[i].me_key);
}
}

return 0;
}

Expand Down Expand Up @@ -7175,6 +7183,13 @@ Unpickler_traverse(UnpicklerObject *self, visitproc visit, void *arg)
Py_VISIT(self->stack);
Py_VISIT(self->pers_func);
Py_VISIT(self->buffers);
PyObject **memo = self->memo;
if (memo) {
Py_ssize_t i = self->memo_size;
while (--i >= 0) {
Py_VISIT(memo[i]);
}
}
return 0;
}

Expand Down
0