romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-01 22:54:17 +03:00
Code Issues Projects Releases Packages Wiki Activity

h2_serverpush: fix file handle leaks reported by clang-tidy

Browse source 
clang-tidy (20.1.6) found it locally consistently. Missed in CI.

Closes #17706
This commit is contained in:
Viktor Szakats 2025-06-22 10:18:12 +02:00
parent d1f036c424
commit 83a8818cfe
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
1 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
tests/client/h2_serverpush.c
View file

@ -59,19 +59,20 @@ static int my_trace(CURL *handle, curl_infotype type,
return 0;
}
static FILE *out_download;
static int setup_h2_serverpush(CURL *hnd, const char *url)
{
FILE *out = fopen("download_0.data", "wb");
if(!out)
/* failed */
return 1;
out_download = fopen("download_0.data", "wb");
if(!out_download)
return 1; /* failed */
curl_easy_setopt(hnd, CURLOPT_URL, url);
curl_easy_setopt(hnd, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0);
curl_easy_setopt(hnd, CURLOPT_SSL_VERIFYPEER, 0L);
curl_easy_setopt(hnd, CURLOPT_SSL_VERIFYHOST, 0L);
curl_easy_setopt(hnd, CURLOPT_WRITEDATA, out);
curl_easy_setopt(hnd, CURLOPT_WRITEDATA, out_download);
/* please be verbose */
curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L);
@ -83,6 +84,8 @@ static int setup_h2_serverpush(CURL *hnd, const char *url)
return 0; /* all is good */
}
static FILE *out_push;
/* called when there's an incoming push */
static int server_push_callback(CURL *parent,
CURL *easy,
@ -94,16 +97,15 @@ static int server_push_callback(CURL *parent,
size_t i;
int *transfers = (int *)userp;
char filename[128];
FILE *out;
static unsigned int count = 0;
int rv;
(void)parent; /* we have no use for this */
curl_msnprintf(filename, sizeof(filename)-1, "push%u", count++);
curl_msnprintf(filename, sizeof(filename) - 1, "push%u", count++);
/* here's a new stream, save it in a new file for each new push */
out = fopen(filename, "wb");
if(!out) {
out_push = fopen(filename, "wb");
if(!out_push) {
/* if we cannot save it, deny it */
curl_mfprintf(stderr, "Failed to create output file for push\n");
rv = CURL_PUSH_DENY;
@ -111,7 +113,7 @@ static int server_push_callback(CURL *parent,
}
/* write to this file */
curl_easy_setopt(easy, CURLOPT_WRITEDATA, out);
curl_easy_setopt(easy, CURLOPT_WRITEDATA, out_push);
curl_mfprintf(stderr, "**** push callback approves stream %u, "
"got %lu headers!\n", count, (unsigned long)num_headers);
@ -158,6 +160,7 @@ static int test_h2_serverpush(int argc, char *argv[])
easy = curl_easy_init();
if(setup_h2_serverpush(easy, url)) {
fclose(out_download);
curl_mfprintf(stderr, "failed\n");
return 1;
}
@ -194,5 +197,9 @@ static int test_h2_serverpush(int argc, char *argv[])
curl_multi_cleanup(multi_handle);
fclose(out_download);
if(out_push)
fclose(out_push);
return 0;
}