Skip to content

gh-84808: Handle errors returned by internal_connect() #122304

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

Merged
merged 3 commits into from
Sep 9, 2024
Merged

gh-84808: Handle errors returned by internal_connect() #122304

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2621a32
gh-84808: Handle errors returned by internal_connect()
korli Jul 26, 2024
ae72c2e
📜🤖 Added by blurb_it.
blurb-it[bot] Sep 6, 2024
2913db3
Update NEWS entry
encukou Sep 9, 2024
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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2024-09-06-10-17-54.gh-issue-84808.ION67Z.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
socketmodule: Handle errors returned by internal_connect()
19 changes: 17 additions & 2 deletions Modules/socketmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3405,6 +3405,18 @@ sock_connect_impl(PySocketSockObject *s, void* Py_UNUSED(data))
return 1;
}

/* Common functionality for socket.connect and socket.connect_ex.
*
* If *raise* is set:
* - On success, return 0.
* - On any failure, return -1 with an exception set.
* If *raise* is zero:
* - On success, return 0.
* - On connect() failure, return errno (without an exception set)
* - On other error, return -1 with an exception set.
*
* Note that -1 is a valid errno value on some systems.
*/
static int
internal_connect(PySocketSockObject *s, struct sockaddr *addr, int addrlen,
int raise)
Expand Down Expand Up @@ -3489,8 +3501,10 @@ sock_connect(PySocketSockObject *s, PyObject *addro)
}

res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 1);
if (res < 0)
if (res < 0) {
assert(PyErr_Occurred());
return NULL;
}

Py_RETURN_NONE;
}
Expand Down Expand Up @@ -3520,8 +3534,9 @@ sock_connect_ex(PySocketSockObject *s, PyObject *addro)
}

res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 0);
if (res < 0)
if (res == -1 && PyErr_Occurred()) {
return NULL;
}

return PyLong_FromLong((long) res);
}
Expand Down