mirror of
https://github.com/python/cpython.git
synced 2025-10-17 20:28:43 +00:00
posix_getlogin(): Handle the possibility that getlogin() can return
NULL without setting errno; observed on Linux Mandrake 7.2 by an anonymous user. This closes bug #124758.
This commit is contained in:
parent
49312a52ec
commit
a30680b240
1 changed files with 12 additions and 3 deletions
|
@ -1904,12 +1904,21 @@ posix_getlogin(PyObject *self, PyObject *args)
|
|||
PyObject *result = NULL;
|
||||
|
||||
if (PyArg_ParseTuple(args, ":getlogin")) {
|
||||
char *name = getlogin();
|
||||
char *name;
|
||||
int old_errno = errno;
|
||||
|
||||
if (name == NULL)
|
||||
posix_error();
|
||||
errno = 0;
|
||||
name = getlogin();
|
||||
if (name == NULL) {
|
||||
if (errno)
|
||||
posix_error();
|
||||
else
|
||||
PyErr_SetString(PyExc_OSError,
|
||||
"unexpected NULL from getlogin()");
|
||||
}
|
||||
else
|
||||
result = PyString_FromString(name);
|
||||
errno = old_errno;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue