Skip to content

Commit

Permalink
ngtcp2: cleanup memory when failing to connect
Browse files Browse the repository at this point in the history
Reported-by: Peter Wu
Fixes #5447 (the ngtcp2 side of it)
Closes #5451
  • Loading branch information
bagder committed May 26, 2020
1 parent 3ff207f commit 96a822f
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions lib/vquic/ngtcp2.c
Expand Up @@ -906,12 +906,9 @@ static int ng_perform_getsock(const struct connectdata *conn,
return ng_getsock((struct connectdata *)conn, socks);
}

static CURLcode ng_disconnect(struct connectdata *conn,
bool dead_connection)
static CURLcode qs_disconnect(struct quicsocket *qs)
{
int i;
struct quicsocket *qs = &conn->hequic[0];
(void)dead_connection;
if(qs->qlogfd != -1)
close(qs->qlogfd);
if(qs->ssl)
Expand All @@ -934,6 +931,13 @@ static CURLcode ng_disconnect(struct connectdata *conn,
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,
unsigned int checks_to_perform)
{
Expand Down Expand Up @@ -1706,18 +1710,22 @@ CURLcode Curl_quic_is_connected(struct connectdata *conn,

result = ng_process_ingress(conn, sockfd, qs);
if(result)
return result;
goto error;

result = ng_flush_egress(conn, sockfd, qs);
if(result)
return result;
goto error;

if(ngtcp2_conn_get_handshake_completed(qs->qconn)) {
*done = TRUE;
ng_has_connected(conn, sockindex);
}

return result;
error:
(void)qs_disconnect(qs);
return result;

}

static CURLcode ng_process_ingress(struct connectdata *conn, int sockfd,
Expand Down

0 comments on commit 96a822f

Please sign in to comment.