From a13c2446dc4620f806ea5155289c36ab91cad484 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 22 Nov 2005 19:30:31 +0000 Subject: [PATCH] Bug #869197: setgroups rejects long integer argument --- Misc/NEWS | 2 ++ Modules/posixmodule.c | 37 +++++++++++++++++++++++++++++++------ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 77e280dcbe..955015602e 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -181,6 +181,8 @@ Core and builtins Extension Modules ----------------- +- Bug #869197: os.setgroups rejects long integer arguments + - Bug #1346533, select.poll() doesn't raise an error if timeout > sys.maxint - Bug #1344508, Fix UNIX mmap leaking file descriptors diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 6f771595fe..a08058f6f1 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -4912,13 +4912,38 @@ posix_setgroups(PyObject *self, PyObject *args) if (!elem) return NULL; if (!PyInt_Check(elem)) { - PyErr_SetString(PyExc_TypeError, - "groups must be integers"); - Py_DECREF(elem); - return NULL; + if (!PyLong_Check(elem)) { + PyErr_SetString(PyExc_TypeError, + "groups must be integers"); + Py_DECREF(elem); + return NULL; + } else { + unsigned long x = PyLong_AsUnsignedLong(elem); + if (PyErr_Occurred()) { + PyErr_SetString(PyExc_TypeError, + "group id too big"); + Py_DECREF(elem); + return NULL; + } + grouplist[i] = x; + /* read back the value to see if it fitted in gid_t */ + if (grouplist[i] != x) { + PyErr_SetString(PyExc_TypeError, + "group id too big"); + Py_DECREF(elem); + return NULL; + } + } + } else { + long x = PyInt_AsLong(elem); + grouplist[i] = x; + if (grouplist[i] != x) { + PyErr_SetString(PyExc_TypeError, + "group id too big"); + Py_DECREF(elem); + return NULL; + } } - /* XXX: check that value fits into gid_t. */ - grouplist[i] = PyInt_AsLong(elem); Py_DECREF(elem); } -- 2.40.0