You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
81 lines
2.6 KiB
81 lines
2.6 KiB
4 months ago
|
From deca8039991886a559b67bcd6701db800a5cf764 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Stefan Eissing <stefan@eissing.org>
|
||
|
|
Date: Wed, 6 Mar 2024 09:36:08 +0100
|
||
|
|
Subject: [PATCH] http2: push headers better cleanup
|
||
|
|
|
||
|
|
- provide common cleanup method for push headers
|
||
|
|
|
||
|
|
Closes #13054
|
||
|
|
---
|
||
|
|
lib/http2.c | 34 +++++++++++++++-------------------
|
||
|
|
1 file changed, 15 insertions(+), 19 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/lib/http2.c b/lib/http2.c
|
||
|
|
index c63ecd38371ab4..96868728a53a1f 100644
|
||
|
|
--- a/lib/http2.c
|
||
|
|
+++ b/lib/http2.c
|
||
|
|
@@ -271,6 +271,15 @@ static CURLcode http2_data_setup(struct Curl_cfilter *cf,
|
||
|
|
return bitmap;
|
||
|
|
}
|
||
|
|
|
||
|
|
+static void free_push_headers(struct HTTP *http)
|
||
|
|
+{
|
||
|
|
+ size_t i;
|
||
|
|
+ for(i = 0; i<http->push_headers_used; i++)
|
||
|
|
+ free(http->push_headers[i]);
|
||
|
|
+ Curl_safefree(http->push_headers);
|
||
|
|
+ http->push_headers_used = 0;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
/*
|
||
|
|
* http2_stream_free() free HTTP2 stream related data
|
||
|
|
*/
|
||
|
|
@@ -306,11 +315,7 @@ static void http2_data_done(struct Curl_cfilter *cf,
|
||
|
|
{
|
||
|
|
if(http) {
|
||
|
|
Curl_dyn_free(&http->header_recvbuf);
|
||
|
|
- for(; http->push_headers_used > 0; --http->push_headers_used) {
|
||
|
|
- free(http->push_headers[http->push_headers_used - 1]);
|
||
|
|
- }
|
||
|
|
- free(http->push_headers);
|
||
|
|
- http->push_headers = NULL;
|
||
|
|
+ free_push_headers(http);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -860,7 +861,6 @@ static int push_promise(struct Curl_cfilter *cf,
|
||
|
|
struct curl_pushheaders heads;
|
||
|
|
CURLMcode rc;
|
||
|
|
struct http_conn *httpc;
|
||
|
|
- size_t i;
|
||
|
|
/* clone the parent */
|
||
|
|
struct Curl_easy *newhandle = duphandle(data);
|
||
|
|
if(!newhandle) {
|
||
|
|
@@ -905,11 +905,7 @@ static int push_promise(struct Curl_cfilter *cf,
|
||
|
|
Curl_set_in_callback(data, false);
|
||
|
|
|
||
|
|
/* free the headers again */
|
||
|
|
- for(i = 0; i<stream->push_headers_used; i++)
|
||
|
|
- free(stream->push_headers[i]);
|
||
|
|
- free(stream->push_headers);
|
||
|
|
- stream->push_headers = NULL;
|
||
|
|
- stream->push_headers_used = 0;
|
||
|
|
+ free_push_headers(stream);
|
||
|
|
|
||
|
|
if(rv) {
|
||
|
|
DEBUGASSERT((rv > CURL_PUSH_OK) && (rv <= CURL_PUSH_ERROROUT));
|
||
|
|
@@ -1426,10 +1422,10 @@ static int on_header(nghttp2_session *session, const nghttp2_frame *frame,
|
||
|
|
stream->push_headers_alloc) {
|
||
|
|
char **headp;
|
||
|
|
stream->push_headers_alloc *= 2;
|
||
|
|
- headp = Curl_saferealloc(stream->push_headers,
|
||
|
|
- stream->push_headers_alloc * sizeof(char *));
|
||
|
|
+ headp = realloc(stream->push_headers,
|
||
|
|
+ stream->push_headers_alloc * sizeof(char *));
|
||
|
|
if(!headp) {
|
||
|
|
- stream->push_headers = NULL;
|
||
|
|
+ free_push_headers(stream);
|
||
|
|
return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
|
||
|
|
}
|
||
|
|
stream->push_headers = headp;
|