curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-17 09:32:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

msh3: fix the QUIC disconnect function

Browse Source 
And free request related memory better in 'done'. Fixes a memory-leak.

Reported-by: Gisle Vanem
Fixes #8915
Closes #9304
This commit is contained in:
Daniel Stenberg 2022-08-12 14:22:03 +02:00
parent ed6e0febe0
commit 011788f0b6
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/vquic/msh3.c
View File

@ -27,7 +27,6 @@
#ifdef USE_MSH3 #ifdef USE_MSH3
#include "urldata.h" #include "urldata.h"
#include "curl_printf.h"
#include "timeval.h" #include "timeval.h"
#include "multiif.h" #include "multiif.h"
#include "sendf.h" #include "sendf.h"
@ -35,6 +34,11 @@
#include "h2h3.h" #include "h2h3.h"
#include "msh3.h" #include "msh3.h"
/* The last 3 #include files should be in this order */
#include "curl_printf.h"
#include "curl_memory.h"
#include "memdebug.h"
/* #define DEBUG_HTTP3 1 */ /* #define DEBUG_HTTP3 1 */
#ifdef DEBUG_HTTP3 #ifdef DEBUG_HTTP3
#define H3BUGF(x) x #define H3BUGF(x) x
@ -222,13 +226,8 @@ static unsigned int msh3_conncheck(struct Curl_easy *data,
return CONNRESULT_NONE; return CONNRESULT_NONE;
} }
static void msh3_cleanup(struct quicsocket *qs, struct HTTP *stream) static void disconnect(struct quicsocket *qs)
{ {
if(stream && stream->recv_buf) {
free(stream->recv_buf);
stream->recv_buf = ZERO_NULL;
msh3_lock_uninitialize(&stream->recv_lock);
}
if(qs->conn) { if(qs->conn) {
MsH3ConnectionClose(qs->conn); MsH3ConnectionClose(qs->conn);
qs->conn = ZERO_NULL; qs->conn = ZERO_NULL;
@ -242,18 +241,20 @@ static void msh3_cleanup(struct quicsocket *qs, struct HTTP *stream)
static CURLcode msh3_disconnect(struct Curl_easy *data, static CURLcode msh3_disconnect(struct Curl_easy *data,
struct connectdata *conn, bool dead_connection) struct connectdata *conn, bool dead_connection)
{ {
(void)data;
(void)dead_connection; (void)dead_connection;
H3BUGF(infof(data, "disconnecting (msh3)")); H3BUGF(infof(data, "disconnecting (msh3)"));
msh3_cleanup(conn->quic, data->req.p.http); disconnect(conn->quic);
return CURLE_OK; return CURLE_OK;
} }
void Curl_quic_disconnect(struct Curl_easy *data, struct connectdata *conn, void Curl_quic_disconnect(struct Curl_easy *data, struct connectdata *conn,
int tempindex) int tempindex)
{ {
(void)data;
if(conn->transport == TRNSPRT_QUIC) { if(conn->transport == TRNSPRT_QUIC) {
H3BUGF(infof(data, "disconnecting (curl)")); H3BUGF(infof(data, "disconnecting QUIC index %u", tempindex));
msh3_cleanup(&conn->hequic[tempindex], data->req.p.http); disconnect(&conn->hequic[tempindex]);
} }
} }
@ -288,7 +289,6 @@ static void MSH3_CALL msh3_header_received(MSH3_REQUEST *Request,
struct HTTP *stream = IfContext; struct HTTP *stream = IfContext;
size_t total_len; size_t total_len;
(void)Request; (void)Request;
H3BUGF(printf("* msh3_header_received\n"));
if(stream->recv_header_complete) { if(stream->recv_header_complete) {
H3BUGF(printf("* ignoring header after data\n")); H3BUGF(printf("* ignoring header after data\n"));
@ -490,9 +490,19 @@ CURLcode Curl_quic_done_sending(struct Curl_easy *data)
void Curl_quic_done(struct Curl_easy *data, bool premature) void Curl_quic_done(struct Curl_easy *data, bool premature)
{ {
(void)data; struct HTTP *stream = data->req.p.http;
(void)premature; (void)premature;
H3BUGF(infof(data, "Curl_quic_done")); H3BUGF(infof(data, "Curl_quic_done"));
if(stream) {
if(stream->recv_buf) {
Curl_safefree(stream->recv_buf);
msh3_lock_uninitialize(&stream->recv_lock);
}
if(stream->req) {
MsH3RequestClose(stream->req);
stream->req = ZERO_NULL;
}
}
} }
bool Curl_quic_data_pending(const struct Curl_easy *data) bool Curl_quic_data_pending(const struct Curl_easy *data)