Skip to content

[3.15] gh-159739: Handle OrderedDict item iterator allocation failures (GH-159774) #159915

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
JelleZijlstra merged 1 commit into from
Oct 20, 2026
+10 −9
Merged

[3.15] gh-159739: Handle OrderedDict item iterator allocation failures (GH-159774) #159915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/2026-10-19-20-38-17.gh-issue-159739.5a6e94.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Avoid a crash when memory allocation fails while creating a
:class:`collections.OrderedDict` items iterator.
17 changes: 8 additions & 9 deletions Objects/odictobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1941,22 +1941,21 @@ odictiter_new(PyODictObject *od, int kind)
odictiterobject *di;
_ODictNode *node;
int reversed = kind & _odict_ITER_REVERSED;

di = PyObject_GC_New(odictiterobject, &PyODictIter_Type);
if (di == NULL)
return NULL;
PyObject *result = NULL;

if ((kind & _odict_ITER_ITEMS) == _odict_ITER_ITEMS) {
di->di_result = _PyTuple_FromPairSteal(Py_None, Py_None);
if (di->di_result == NULL) {
Py_DECREF(di);
result = _PyTuple_FromPairSteal(Py_None, Py_None);
if (result == NULL) {
return NULL;
}
}
else {
di->di_result = NULL;
di = PyObject_GC_New(odictiterobject, &PyODictIter_Type);
if (di == NULL) {
Py_XDECREF(result);
return NULL;
}

di->di_result = result;
di->kind = kind;
node = reversed ? _odict_LAST(od) : _odict_FIRST(od);
di->di_current = node ? Py_NewRef(_odictnode_KEY(node)) : NULL;
Expand Down
Loading