Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

gh-146205: Check the errno with != 0 in close impls in select module#146206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
vstinner merged 2 commits intopython:mainfromaisk:fix-select-close
Mar 20, 2026
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletionsLib/test/test_devpoll.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

# Initial tests are copied as is from "test_poll.py"

import errno
import os
import random
import select
Expand DownExpand Up@@ -112,6 +113,15 @@ def test_close(self):
self.assertRaises(ValueError, devpoll.register, fd, select.POLLIN)
self.assertRaises(ValueError, devpoll.unregister, fd)

def test_close_error(self):
# gh-146205: close() should raise OSError if underlying fd is invalid
devpoll = select.devpoll()
fd = devpoll.fileno()
os.close(fd)
with self.assertRaises(OSError) as cm:
devpoll.close()
self.assertEqual(cm.exception.errno, errno.EBADF)

def test_fd_non_inheritable(self):
devpoll = select.devpoll()
self.addCleanup(devpoll.close)
Expand Down
9 changes: 9 additions & 0 deletionsLib/test/test_epoll.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -259,6 +259,15 @@ def test_close(self):
self.assertRaises(ValueError, epoll.register, fd, select.EPOLLIN)
self.assertRaises(ValueError, epoll.unregister, fd)

def test_close_error(self):
# gh-146205: close() should raise OSError if underlying fd is invalid
epoll = select.epoll()
fd = epoll.fileno()
os.close(fd)
with self.assertRaises(OSError) as cm:
epoll.close()
self.assertEqual(cm.exception.errno, errno.EBADF)

def test_fd_non_inheritable(self):
epoll = select.epoll()
self.addCleanup(epoll.close)
Expand Down
9 changes: 9 additions & 0 deletionsLib/test/test_kqueue.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -254,6 +254,15 @@ def test_close(self):
# operations must fail with ValueError("I/O operation on closed ...")
self.assertRaises(ValueError, kqueue.control, None, 4)

def test_close_error(self):
# gh-146205: close() should raise OSError if underlying fd is invalid
kqueue = select.kqueue()
fd = kqueue.fileno()
os.close(fd)
with self.assertRaises(OSError) as cm:
kqueue.close()
self.assertEqual(cm.exception.errno, errno.EBADF)

def test_fd_non_inheritable(self):
kqueue = select.kqueue()
self.addCleanup(kqueue.close)
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
Fixed a bug where :meth:`select.epoll.close`, :meth:`select.kqueue.close`,
and :meth:`select.devpoll.close` silently ignored errors.
15 changes: 9 additions & 6 deletionsModules/selectmodule.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1118,8 +1118,9 @@ static PyObject *
select_devpoll_close_impl(devpollObject *self)
/*[clinic end generated code: output=26b355bd6429f21b input=408fde21a377ccfb]*/
{
errno = devpoll_internal_close(self);
if (errno < 0) {
int err = devpoll_internal_close(self);
if (err != 0) {
errno = err;
PyErr_SetFromErrno(PyExc_OSError);
return NULL;
}
Expand DownExpand Up@@ -1446,8 +1447,9 @@ static PyObject *
select_epoll_close_impl(pyEpoll_Object *self)
/*[clinic end generated code: output=ee2144c446a1a435 input=f626a769192e1dbe]*/
{
errno = pyepoll_internal_close(self);
if (errno < 0) {
int err = pyepoll_internal_close(self);
if (err != 0) {
errno = err;
PyErr_SetFromErrno(PyExc_OSError);
return NULL;
}
Expand DownExpand Up@@ -2263,8 +2265,9 @@ static PyObject *
select_kqueue_close_impl(kqueue_queue_Object *self)
/*[clinic end generated code: output=d1c7df0b407a4bc1 input=6d763c858b17b690]*/
{
errno = kqueue_queue_internal_close(self);
if (errno < 0) {
int err = kqueue_queue_internal_close(self);
if (err != 0) {
errno = err;
PyErr_SetFromErrno(PyExc_OSError);
return NULL;
}
Expand Down
Loading
[8]ページ先頭
©2009-2026 Movatter.jp