Skip to content

gh-116738: Inline append for local PyList #135196

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

Closed
wants to merge 4 commits into from
Closed

gh-116738: Inline append for local PyList #135196

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70ba3ab
gh-116738: Inline append for local PyList
yoney Jun 5, 2025
d47b85c
gh-116738: Assert list is uniquely referenced
yoney Jun 10, 2025
cf5d8ec
gh-116738: Let _PyList_AppendTakeRef() steal the reference
yoney Jun 10, 2025
9db2605
Merge branch 'main' into ft_grpmodule
mpage Jun 11, 2025
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
9 changes: 6 additions & 3 deletions Modules/grpmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#include "Python.h"
#include "posixmodule.h"
#include "pycore_list.h" // _PyList_AppendTakeRef()
#include "pycore_object.h" // _PyObject_IsUniquelyReferenced()

#include <errno.h> // ERANGE
#include <grp.h> // getgrgid_r()
Expand Down Expand Up @@ -290,18 +292,19 @@ grp_getgrall_impl(PyObject *module)
setgrent();

struct group *p;
// `d` is a local list; append items without a lock using
// _PyList_AppendTakeRef() within the loop.
assert(_PyObject_IsUniquelyReferenced(d));
Copy link
Contributor

Choose a reason for hiding this comment

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

d is not passed anywhere, isn't this obvious? we never added such assertions where it was obvious like this case

while ((p = getgrent()) != NULL) {
// gh-126316: Don't release the mutex around mkgrent() since
// setgrent()/endgrent() are not reentrant / thread-safe. A deadlock
// is unlikely since mkgrent() should not be able to call arbitrary
// Python code.
PyObject *v = mkgrent(module, p);
if (v == NULL || PyList_Append(d, v) != 0) {
Py_XDECREF(v);
if (v == NULL || _PyList_AppendTakeRef((PyListObject *)d, v) != 0) {
Py_CLEAR(d);
goto done;
}
Py_DECREF(v);
}

done:
Expand Down
Loading