Skip to content

gh-145376: Fix various reference leaks objects and modules #145385

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
vstinner merged 10 commits into from
Mar 9, 2026
Merged

gh-145376: Fix various reference leaks objects and modules #145385

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f708b03
Fix reference leak in listiter_reduce_general
eendebakpt Mar 1, 2026
551a741
Fix reference leak in increment_longindex_lock_held
eendebakpt Mar 1, 2026
7015ae6
fix reference leak in count_nextlong
eendebakpt Mar 1, 2026
c02d2db
fix reference leak in count_nextlong
eendebakpt Mar 1, 2026
ff7709c
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 1, 2026
edf016b
review comments
eendebakpt Mar 5, 2026
17f8799
remove news entry
eendebakpt Mar 5, 2026
a7c4497
review comments
eendebakpt Mar 5, 2026
14b2e7f
Apply suggestion from @eendebakpt
eendebakpt Mar 6, 2026
98252fa
Merge branch 'main' into refleaks
eendebakpt Mar 8, 2026
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
25 changes: 14 additions & 11 deletions Modules/itertoolsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3531,23 +3531,26 @@ count_traverse(PyObject *op, visitproc visit, void *arg)
static PyObject *
count_nextlong(countobject *lz)
{
PyObject *long_cnt;
PyObject *stepped_up;

long_cnt = lz->long_cnt;
if (long_cnt == NULL) {
if (lz->long_cnt == NULL) {
/* Switch to slow_mode */
long_cnt = PyLong_FromSsize_t(PY_SSIZE_T_MAX);
if (long_cnt == NULL)
lz->long_cnt = PyLong_FromSsize_t(PY_SSIZE_T_MAX);
if (lz->long_cnt == NULL) {
return NULL;
}
}
assert(lz->cnt == PY_SSIZE_T_MAX && long_cnt != NULL);
assert(lz->cnt == PY_SSIZE_T_MAX && lz->long_cnt != NULL);

// We hold one reference to "result" (a.k.a. the old value of
// lz->long_cnt); we'll either return it or keep it in lz->long_cnt.
PyObject *result = lz->long_cnt;

stepped_up = PyNumber_Add(long_cnt, lz->long_step);
if (stepped_up == NULL)
PyObject *stepped_up = PyNumber_Add(result, lz->long_step);
if (stepped_up == NULL) {
return NULL;
}
lz->long_cnt = stepped_up;
return long_cnt;

return result;
}
Comment on lines 3531 to 3554
Copy link
Copy Markdown
Member

@encukou encukou Mar 4, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this the way to make it less confusing?

static PyObject *
count_nextlong(countobject *lz)
{
    if (lz->long_cnt == NULL) {
        /* Switch to slow_mode */
        lz->long_cnt = PyLong_FromSsize_t(PY_SSIZE_T_MAX);
        if (lz->long_cnt == NULL) {
            return NULL;
        }
    }
    assert(lz->cnt == PY_SSIZE_T_MAX && lz->long_cnt != NULL);

    // We hold one reference to "result" (a.k.a. the old value of
    // lz->long_cnt); we'll either return it or keep it in lz->long_cnt.
    PyObject *result = lz->long_cnt;

    PyObject *stepped_up = PyNumber_Add(result, lz->long_step);
    if (stepped_up == NULL) {
        return NULL;
    }
    lz->long_cnt = stepped_up;

    return result;
}

Copy link
Copy Markdown
Contributor

@sergey-miryanov sergey-miryanov Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this looks less confusing.


static PyObject *
Expand Down
1 change: 1 addition & 0 deletions Objects/enumobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ increment_longindex_lock_held(enumobject *en)
if (next_index == NULL) {
return NULL;
}
en->en_longindex = next_index;
Comment thread
sergey-miryanov marked this conversation as resolved.
Outdated
}
assert(next_index != NULL);
Comment thread
eendebakpt marked this conversation as resolved.
Outdated
PyObject *stepped_up = PyNumber_Add(next_index, en->one);
Expand Down
4 changes: 3 additions & 1 deletion Objects/listobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4270,7 +4270,9 @@ listiter_reduce_general(void *_it, int forward)
}
/* empty iterator, create an empty list */
list = PyList_New(0);
if (list == NULL)
if (list == NULL) {
Py_DECREF(iter);
return NULL;
}
return Py_BuildValue("N(N)", iter, list);
}
Loading