Skip to content

Commit 424490f

Browse files
committed
gh-107545: Fix misleading setsockopt error message
1 parent 6ef8f8c commit 424490f

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

Modules/socketmodule.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3172,6 +3172,9 @@ sock_setsockopt(PySocketSockObject *s, PyObject *args)
31723172
(char*)&flag, sizeof flag);
31733173
goto done;
31743174
}
3175+
if (!PyErr_ExceptionMatches(PyExc_TypeError)) {
3176+
return NULL;
3177+
}
31753178

31763179
PyErr_Clear();
31773180
/* setsockopt(level, opt, None, flag) */
@@ -3182,6 +3185,9 @@ sock_setsockopt(PySocketSockObject *s, PyObject *args)
31823185
NULL, (socklen_t)optlen);
31833186
goto done;
31843187
}
3188+
if (!PyErr_ExceptionMatches(PyExc_TypeError)) {
3189+
return NULL;
3190+
}
31853191

31863192
PyErr_Clear();
31873193
/* setsockopt(level, opt, buffer) */

0 commit comments

Comments
 (0)