curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-20 19:12:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

quiche: clean up memory properly when failing to connect

Browse Source 
Addresses the quiche side of #5447
Reported-by: Peter Wu
Closes #5450
This commit is contained in:
Daniel Stenberg 2020-05-25 17:24:36 +02:00
parent d23cc224e6
commit 3ff207f7e3
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/vquic/quiche.c
View File

@ -89,18 +89,24 @@ static int quiche_perform_getsock(const struct connectdata *conn,
return quiche_getsock((struct connectdata *)conn, socks); return quiche_getsock((struct connectdata *)conn, socks);
} }
static CURLcode quiche_disconnect(struct connectdata *conn, static CURLcode qs_disconnect(struct quicsocket *qs)
bool dead_connection)
{ {
struct quicsocket *qs = conn->quic; if(qs->h3config)
(void)dead_connection;
quiche_h3_config_free(qs->h3config); quiche_h3_config_free(qs->h3config);
if(qs->h3c)
quiche_h3_conn_free(qs->h3c); quiche_h3_conn_free(qs->h3c);
quiche_config_free(qs->cfg); quiche_config_free(qs->cfg);
quiche_conn_free(qs->conn); quiche_conn_free(qs->conn);
return CURLE_OK; return CURLE_OK;
} }
static CURLcode quiche_disconnect(struct connectdata *conn,
bool dead_connection)
{
struct quicsocket *qs = conn->quic;
(void)dead_connection;
return qs_disconnect(qs);
}
static unsigned int quiche_conncheck(struct connectdata *conn, static unsigned int quiche_conncheck(struct connectdata *conn,
unsigned int checks_to_perform) unsigned int checks_to_perform)
{ {
@ -284,11 +290,11 @@ CURLcode Curl_quic_is_connected(struct connectdata *conn, int sockindex,
result = process_ingress(conn, sockfd, qs); result = process_ingress(conn, sockfd, qs);
if(result) if(result)
return result; goto error;
result = flush_egress(conn, sockfd, qs); result = flush_egress(conn, sockfd, qs);
if(result) if(result)
return result; goto error;
if(quiche_conn_is_established(qs->conn)) { if(quiche_conn_is_established(qs->conn)) {
*done = TRUE; *done = TRUE;
@ -297,6 +303,9 @@ CURLcode Curl_quic_is_connected(struct connectdata *conn, int sockindex,
} }
return result; return result;
error:
qs_disconnect(qs);
return result;
} }
static CURLcode process_ingress(struct connectdata *conn, int sockfd, static CURLcode process_ingress(struct connectdata *conn, int sockfd,