Skip to content

Commit f85c7dc

Browse files
committed
gh-107545: Fix misleading setsockopt error message
1 parent bda1218 commit f85c7dc

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
@@ -3373,6 +3373,9 @@ sock_setsockopt(PyObject *self, PyObject *args)
33733373
(char*)&flag, sizeof flag);
33743374
goto done;
33753375
}
3376+
if (!PyErr_ExceptionMatches(PyExc_TypeError)) {
3377+
return NULL;
3378+
}
33763379

33773380
PyErr_Clear();
33783381
/* setsockopt(level, opt, None, flag) */
@@ -3383,6 +3386,9 @@ sock_setsockopt(PyObject *self, PyObject *args)
33833386
NULL, (socklen_t)optlen);
33843387
goto done;
33853388
}
3389+
if (!PyErr_ExceptionMatches(PyExc_TypeError)) {
3390+
return NULL;
3391+
}
33863392

33873393
PyErr_Clear();
33883394
/* setsockopt(level, opt, buffer) */

0 commit comments

Comments
 (0)