summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2020-03-23 19:00:57 (GMT)
committerGitHub <noreply@github.com>2020-03-23 19:00:57 (GMT)
commit8ec7370c89aa522602eb9604086ce9f09770953d (patch)
treeab139eeb1b37a3ceedc0ec852dea8bdeae03e045
parentbd409bb5b78e7ccac5fcda9ab4cec770552f3090 (diff)
downloadcpython-8ec7370c89aa522602eb9604086ce9f09770953d.zip
cpython-8ec7370c89aa522602eb9604086ce9f09770953d.tar.gz
cpython-8ec7370c89aa522602eb9604086ce9f09770953d.tar.bz2
bpo-40014: Fix os.getgrouplist() on macOS (GH-19118)
On macOS, getgrouplist() returns a non-zero value without setting errno if the group list is too small. Double the list size and call it again in this case.
-rw-r--r--Misc/NEWS.d/next/Library/2020-03-23-17-52-00.bpo-40014.Ya70VG.rst3
-rw-r--r--Modules/posixmodule.c19
2 files changed, 22 insertions, 0 deletions
diff --git a/Misc/NEWS.d/next/Library/2020-03-23-17-52-00.bpo-40014.Ya70VG.rst b/Misc/NEWS.d/next/Library/2020-03-23-17-52-00.bpo-40014.Ya70VG.rst
new file mode 100644
index 0000000..58f14fa
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-03-23-17-52-00.bpo-40014.Ya70VG.rst
@@ -0,0 +1,3 @@
+Fix ``os.getgrouplist()``: on macOS, the ``getgrouplist()`` function returns a
+non-zero value without setting ``errno`` if the group list is too small. Double
+the list size and call it again in this case.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index ffee87c..e489b74 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -6999,10 +6999,29 @@ posix_getgrouplist(PyObject *self, PyObject *args)
if (groups == NULL)
return PyErr_NoMemory();
+#ifdef __APPLE__
+ while (getgrouplist(user, basegid, groups, &ngroups)) {
+ /* On macOS, getgrouplist() returns a non-zero value without setting
+ errno if the group list is too small. Double the list size and call
+ it again in this case. */
+ PyMem_Free(groups);
+
+ if (ngroups > INT_MAX / 2) {
+ return PyErr_NoMemory();
+ }
+ ngroups *= 2;
+
+ groups = PyMem_New(int, ngroups);
+ if (groups == NULL) {
+ return PyErr_NoMemory();
+ }
+ }
+#else
if (getgrouplist(user, basegid, groups, &ngroups) == -1) {
PyMem_Del(groups);
return posix_error();
}
+#endif
#ifdef _Py_MEMORY_SANITIZER
/* Clang memory sanitizer libc intercepts don't know getgrouplist. */