Skip to content

Commit b93bfd9

Browse files
committed
external/curl: let curl cleanup what it wants but
do not create double free situation inside OpenSSL that relates to the problematic static linking of LIBPKGFLAT inside pkg. pkg-static isn't affected, but since we are exiting at this point it makes little sense to actively clear memory leaks that get torn down anyway.
1 parent d9e62a7 commit b93bfd9

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

external/curl/lib/vtls/openssl.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2231,6 +2231,12 @@ static CURLcode ossl_shutdown(struct Curl_cfilter *cf,
22312231
return result;
22322232
}
22332233

2234+
static void ossl_noclose(struct Curl_cfilter *cf, struct Curl_easy *data)
2235+
{
2236+
(void)cf;
2237+
(void)data;
2238+
}
2239+
22342240
static void ossl_close(struct Curl_cfilter *cf, struct Curl_easy *data)
22352241
{
22362242
struct ssl_connect_data *connssl = cf->ctx;
@@ -5741,7 +5747,7 @@ const struct Curl_ssl Curl_ssl_openssl = {
57415747
ossl_connect, /* connect */
57425748
Curl_ssl_adjust_pollset, /* adjust_pollset */
57435749
ossl_get_internals, /* get_internals */
5744-
ossl_close, /* close_one */
5750+
ossl_noclose, /* close_one */
57455751
ossl_close_all, /* close_all */
57465752
ossl_set_engine, /* set_engine or provider */
57475753
ossl_set_engine_default, /* set_engine_default */

0 commit comments

Comments
 (0)