moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-24 00:58:48 -05:00
Code Issues Releases Wiki Activity

ngtcp2: cleanup memory when failing to connect

Browse Source 
Reported-by: Peter Wu
Fixes #5447 (the ngtcp2 side of it)
Closes #5451
This commit is contained in:
Daniel Stenberg 2020-05-25 17:55:16 +02:00
parent 3ff207f7e3
commit 96a822f6e2
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/vquic/ngtcp2.c
View File

@ -906,12 +906,9 @@ static int ng_perform_getsock(const struct connectdata *conn,
return ng_getsock((struct connectdata *)conn, socks); return ng_getsock((struct connectdata *)conn, socks);
} }
static CURLcode ng_disconnect(struct connectdata *conn, static CURLcode qs_disconnect(struct quicsocket *qs)
bool dead_connection)
{ {
int i; int i;
struct quicsocket *qs = &conn->hequic[0];
(void)dead_connection;
if(qs->qlogfd != -1) if(qs->qlogfd != -1)
close(qs->qlogfd); close(qs->qlogfd);
if(qs->ssl) if(qs->ssl)
@ -934,6 +931,13 @@ static CURLcode ng_disconnect(struct connectdata *conn,
return CURLE_OK; return CURLE_OK;
} }
static CURLcode ng_disconnect(struct connectdata *conn,
bool dead_connection)
{
(void)dead_connection;
return qs_disconnect(&conn->hequic[0]);
}
static unsigned int ng_conncheck(struct connectdata *conn, static unsigned int ng_conncheck(struct connectdata *conn,
unsigned int checks_to_perform) unsigned int checks_to_perform)
{ {
@ -1706,11 +1710,11 @@ CURLcode Curl_quic_is_connected(struct connectdata *conn,
result = ng_process_ingress(conn, sockfd, qs); result = ng_process_ingress(conn, sockfd, qs);
if(result) if(result)
return result; goto error;
result = ng_flush_egress(conn, sockfd, qs); result = ng_flush_egress(conn, sockfd, qs);
if(result) if(result)
return result; goto error;
if(ngtcp2_conn_get_handshake_completed(qs->qconn)) { if(ngtcp2_conn_get_handshake_completed(qs->qconn)) {
*done = TRUE; *done = TRUE;
@ -1718,6 +1722,10 @@ CURLcode Curl_quic_is_connected(struct connectdata *conn,
} }
return result; return result;
error:
(void)qs_disconnect(qs);
return result;
} }
static CURLcode ng_process_ingress(struct connectdata *conn, int sockfd, static CURLcode ng_process_ingress(struct connectdata *conn, int sockfd,