mirror of
https://github.com/python/cpython.git
synced 2025-12-08 06:10:17 +00:00
gh-100218: correctly set errno when socket.if_{nametoindex,indextoname} raise OSError (#140905)
Previously, socket.if_nametoindex() and socket.if_indextoname() could raise an `OSError` with a `None` errno. Now, the errno from libc is propagated.
This commit is contained in:
parent
0c77e7c23b
commit
3ce2d57b2f
3 changed files with 14 additions and 4 deletions
|
|
@ -7294,10 +7294,10 @@ _socket_if_nametoindex_impl(PyObject *module, PyObject *oname)
|
|||
unsigned long index;
|
||||
#endif
|
||||
|
||||
errno = ENODEV; // in case 'if_nametoindex' does not set errno
|
||||
index = if_nametoindex(PyBytes_AS_STRING(oname));
|
||||
if (index == 0) {
|
||||
/* if_nametoindex() doesn't set errno */
|
||||
PyErr_SetString(PyExc_OSError, "no interface with this name");
|
||||
PyErr_SetFromErrno(PyExc_OSError);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
@ -7317,6 +7317,7 @@ static PyObject *
|
|||
_socket_if_indextoname_impl(PyObject *module, NET_IFINDEX index)
|
||||
/*[clinic end generated code: output=e48bc324993052e0 input=c93f753d0cf6d7d1]*/
|
||||
{
|
||||
errno = ENXIO; // in case 'if_indextoname' does not set errno
|
||||
char name[IF_NAMESIZE + 1];
|
||||
if (if_indextoname(index, name) == NULL) {
|
||||
PyErr_SetFromErrno(PyExc_OSError);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue