traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reject float as uid or gid. 

A regression was introduced in the commit for issue #4591.
This commit is contained in:
Serhiy Storchaka 2013-02-10 23:28:33 +02:00
parent c2d020090b b462189921
commit a7b5e82ff0
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Modules/posixmodule.c
View File

@ -406,7 +406,13 @@ int
_Py_Uid_Converter(PyObject *obj, void *p) _Py_Uid_Converter(PyObject *obj, void *p)
{ {
int overflow; int overflow;
long result = PyLong_AsLongAndOverflow(obj, &overflow); long result;
if (PyFloat_Check(obj)) {
PyErr_SetString(PyExc_TypeError,
"integer argument expected, got float");
return 0;
}
result = PyLong_AsLongAndOverflow(obj, &overflow);
if (overflow < 0) if (overflow < 0)
goto OverflowDown; goto OverflowDown;
if (!overflow && result == -1) { if (!overflow && result == -1) {
@ -454,7 +460,13 @@ int
_Py_Gid_Converter(PyObject *obj, void *p) _Py_Gid_Converter(PyObject *obj, void *p)
{ {
int overflow; int overflow;
long result = PyLong_AsLongAndOverflow(obj, &overflow); long result;
if (PyFloat_Check(obj)) {
PyErr_SetString(PyExc_TypeError,
"integer argument expected, got float");
return 0;
}
result = PyLong_AsLongAndOverflow(obj, &overflow);
if (overflow < 0) if (overflow < 0)
goto OverflowDown; goto OverflowDown;
if (!overflow && result == -1) { if (!overflow && result == -1) {