diff options
| -rw-r--r-- | ssl/quic/quic_impl.c | 8 | ||||
| -rw-r--r-- | ssl/quic/quic_tserver.c | 4 | ||||
| -rw-r--r-- | test/quic_multistream_test.c | 6 |
3 files changed, 8 insertions, 10 deletions
diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c index beec26c019..cb927fa52d 100644 --- a/ssl/quic/quic_impl.c +++ b/ssl/quic/quic_impl.c @@ -545,8 +545,8 @@ void ossl_quic_free(SSL *s) ossl_quic_channel_free(ctx.qc->ch); - BIO_free(ctx.qc->net_rbio); - BIO_free(ctx.qc->net_wbio); + BIO_free_all(ctx.qc->net_rbio); + BIO_free_all(ctx.qc->net_wbio); /* Note: SSL_free calls OPENSSL_free(qc) for us */ @@ -876,7 +876,7 @@ void ossl_quic_conn_set0_net_rbio(SSL *s, BIO *net_rbio) if (!ossl_quic_channel_set_net_rbio(ctx.qc->ch, net_rbio)) return; - BIO_free(ctx.qc->net_rbio); + BIO_free_all(ctx.qc->net_rbio); ctx.qc->net_rbio = net_rbio; if (net_rbio != NULL) @@ -903,7 +903,7 @@ void ossl_quic_conn_set0_net_wbio(SSL *s, BIO *net_wbio) if (!ossl_quic_channel_set_net_wbio(ctx.qc->ch, net_wbio)) return; - BIO_free(ctx.qc->net_wbio); + BIO_free_all(ctx.qc->net_wbio); ctx.qc->net_wbio = net_wbio; if (net_wbio != NULL) diff --git a/ssl/quic/quic_tserver.c b/ssl/quic/quic_tserver.c index 92c17d10f3..3630577e70 100644 --- a/ssl/quic/quic_tserver.c +++ b/ssl/quic/quic_tserver.c @@ -159,8 +159,8 @@ void ossl_quic_tserver_free(QUIC_TSERVER *srv) return; ossl_quic_channel_free(srv->ch); - BIO_free(srv->args.net_rbio); - BIO_free(srv->args.net_wbio); + BIO_free_all(srv->args.net_rbio); + BIO_free_all(srv->args.net_wbio); OPENSSL_free(srv->ssl); SSL_free(srv->tls); SSL_CTX_free(srv->ctx); diff --git a/test/quic_multistream_test.c b/test/quic_multistream_test.c index b401e78e32..2ad4ef292e 100644 --- a/test/quic_multistream_test.c +++ b/test/quic_multistream_test.c @@ -746,10 +746,8 @@ static int helper_init(struct helper *h, int free_order, int blocking, BIO_set_data(h->s_qtf_wbio, h->qtf); } - if (!need_injector) - h->s_net_bio_own = NULL; - - h->s_qtf_wbio_own = NULL; + h->s_net_bio_own = NULL; + h->s_qtf_wbio_own = NULL; h->c_fd = BIO_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP, 0); if (!TEST_int_ge(h->c_fd, 0)) |