mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-16 11:49:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-46606: os.getgroups() doesn't overallocate (GH-31569)

Browse source
This commit is contained in:
Victor Stinner 2022-02-27 00:14:28 +01:00 • committed by GitHub
parent fc44b8136f
commit e02c47528b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Modules/posixmodule.c
View file

@ -7623,30 +7623,20 @@ static PyObject *
os_getgroups_impl(PyObject *module) os_getgroups_impl(PyObject *module)
/*[clinic end generated code: output=42b0c17758561b56 input=d3f109412e6a155c]*/ /*[clinic end generated code: output=42b0c17758561b56 input=d3f109412e6a155c]*/
{ {
/* On MacOSX getgroups(2) can return more than MAX_GROUPS results // Call getgroups with length 0 to get the actual number of groups
* This is a helper variable to store the intermediate result when int n = getgroups(0, NULL);
* that happens.
*
* See bpo-7900.
*/
gid_t *grouplist = NULL;
int n;
/* Issue #17557: As of OS X 10.8, getgroups(2) no longer raises EINVAL if
* there are more groups than can fit in grouplist. Therefore, on OS X
* always first call getgroups with length 0 to get the actual number
* of groups.
*/
n = getgroups(0, NULL);
if (n < 0) { if (n < 0) {
return posix_error(); return posix_error();
} else { }
n++; // Avoid malloc(0)
grouplist = PyMem_New(gid_t, n+1); if (n == 0) {
return PyList_New(0);
}
gid_t *grouplist = PyMem_New(gid_t, n);
if (grouplist == NULL) { if (grouplist == NULL) {
return PyErr_NoMemory(); return PyErr_NoMemory();
} }
}
n = getgroups(n, grouplist); n = getgroups(n, grouplist);
if (n == -1) { if (n == -1) {
@ -7655,22 +7645,25 @@ os_getgroups_impl(PyObject *module)
} }
PyObject *result = PyList_New(n); PyObject *result = PyList_New(n);
if (result != NULL) { if (result == NULL) {
int i; goto error;
for (i = 0; i < n; ++i) {
PyObject *o = _PyLong_FromGid(grouplist[i]);
if (o == NULL) {
Py_DECREF(result);
result = NULL;
break;
}
PyList_SET_ITEM(result, i, o);
}
} }
for (int i = 0; i < n; ++i) {
PyObject *group = _PyLong_FromGid(grouplist[i]);
if (group == NULL) {
goto error;
}
PyList_SET_ITEM(result, i, group);
}
PyMem_Free(grouplist); PyMem_Free(grouplist);
return result; return result;
error:
PyMem_Free(grouplist);
Py_XDECREF(result);
return NULL;
} }
#endif /* HAVE_GETGROUPS */ #endif /* HAVE_GETGROUPS */