8000 gh-107545: Fix misleading setsockopt error message by naweiss · Pull Request #107546 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-107545: Fix misleading setsockopt error message #107546

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

gh-107545: Fix misleading setsockopt error message #107546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f85c7dc
gh-107545: Fix misleading setsockopt error message
naweiss Jun 23, 2025
82be245
Add tests for setsockopt errors
naweiss Jun 23, 2025
167d212
Add issue to news
naweiss Jun 23, 2025
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
25 changes: 25 additions & 0 deletions Lib/test/test_socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1538,6 +1538,31 @@ def testSetSockOpt(self):
reuse = sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR)
self.assertFalse(reuse == 0, "failed to set reuse mode")

@unittest.skipIf(_testcapi is None, "requires _testcapi")
def test_setsockopt_errors(self):
# See issue #107546.
from _testcapi import INT_MAX, INT_MIN

sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.addCleanup(sock.close)

sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) # No error expected.

with self.assertRaises(OverflowError):
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, INT_MAX + 1)

with self.assertRaises(OverflowError):
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, INT_MIN - 1)

with self.assertRaises(OverflowError):
sock.setsockopt(socket.SOL_SOCKET, INT_MAX + 1, 1)

with self.assertRaises(OverflowError):
sock.setsockopt(INT_MAX + 1, socket.SO_REUSEADDR, 1)

with self.assertRaises(TypeError):
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, dict())

def testSendAfterClose(self):
# testing send() after close() with timeout
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2025-06-24-00-21-27.gh-issue-107545.GDa7Zs.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Improve error message when :meth:`~socket.socket.setsockopt` raises an error
other than a :exc:`TypeError`.
6 changes: 6 additions & 0 deletions Modules/socketmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3373,6 +3373,9 @@ sock_setsockopt(PyObject *self, PyObject *args)
(char*)&flag, sizeof flag);
goto done;
}
if (!PyErr_ExceptionMatches(PyExc_TypeError)) {
return NULL;
}

PyErr_Clear();
/* setsockopt(level, opt, None, flag) */
Expand All @@ -3383,6 +3386,9 @@ sock_setsockopt(PyObject *self, PyObject *args)
NULL, (socklen_t)optlen);
goto done;
}
if (!PyErr_ExceptionMatches(PyExc_TypeError)) {
return NULL;
}

PyErr_Clear();
/* setsockopt(level, opt, buffer) */
Expand Down
Loading
0