romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-05-01 10:17:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

sws: pass in socket reference to allow function to close it

Browse source 
The function service_connection() now passes in a reference to the
socket instead of by value since the sub function http_connect() might
close it and set *infdp = CURL_SOCKET_BAD. This would previously not be
detected when service_connection() returned and potentially cause a
double close of the socket.

Reported-by: Joshua Rogers

Closes #19031
This commit is contained in:
Daniel Stenberg 2025-10-12 11:15:08 +02:00
parent 578706adde
commit 1e90a63a49
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/server/sws.c
View file

@ -1898,7 +1898,7 @@ static curl_socket_t accept_connection(curl_socket_t sock)
/* returns 1 if the connection should be serviced again immediately, 0 if there
is no data waiting, or < 0 if it should be closed */
static int service_connection(curl_socket_t msgsock,
static int service_connection(curl_socket_t *msgsock,
struct sws_httprequest *req,
curl_socket_t listensock,
const char *connecthost,
@ -1908,7 +1908,7 @@ static int service_connection(curl_socket_t msgsock,
return -1;
while(!req->done_processing) {
int rc = sws_get_request(msgsock, req);
int rc = sws_get_request(*msgsock, req);
if(rc <= 0) {
/* Nothing further to read now, possibly because the socket was closed */
return rc;
@ -1928,7 +1928,7 @@ static int service_connection(curl_socket_t msgsock,
}
}
sws_send_doc(msgsock, req);
sws_send_doc(*msgsock, req);
if(got_exit_signal)
return -1;
@ -1948,7 +1948,7 @@ static int service_connection(curl_socket_t msgsock,
return 1;
}
else {
http_connect(&msgsock, listensock, connecthost, req->connect_port,
http_connect(msgsock, listensock, connecthost, req->connect_port,
keepalive_secs);
return -1;
}
@ -2391,7 +2391,7 @@ static int test_sws(int argc, char *argv[])
/* Service this connection until it has nothing available */
do {
rc = service_connection(all_sockets[socket_idx], req, sock,
rc = service_connection(&all_sockets[socket_idx], req, sock,
connecthost, keepalive_secs);
if(got_exit_signal)
goto sws_cleanup;