diff options
| author | Hugo Landau <hlandau@openssl.org> | 2023-04-26 15:56:59 +0100 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2023-05-12 14:47:14 +0100 |
| commit | 22b1a96ff798cf73f4b573bff1d9f80236d3f102 (patch) | |
| tree | 57096e855e78c11b08d4bc04dc5f015975c2142c /ssl/quic/quic_impl.c | |
| parent | 496b8162b6b7048a05809f5e85825ed02dff8a7c (diff) | |
| download | openssl-new-22b1a96ff798cf73f4b573bff1d9f80236d3f102.tar.gz | |
QUIC MSST: Minor fixes and cleanups
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20765)
Diffstat (limited to 'ssl/quic/quic_impl.c')
| -rw-r--r-- | ssl/quic/quic_impl.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c index cce1bde5c4..581117d537 100644 --- a/ssl/quic/quic_impl.c +++ b/ssl/quic/quic_impl.c @@ -341,6 +341,8 @@ void ossl_quic_free(SSL *s) if (!expect_quic(s, &ctx)) return; + quic_lock(ctx.qc); + if (ctx.is_stream) { /* * When a QSSO is freed, the XSO is freed immediately, because the XSO @@ -349,8 +351,6 @@ void ossl_quic_free(SSL *s) * as deleted for later collection. */ - quic_lock(ctx.qc); - assert(ctx.qc->num_xso > 0); --ctx.qc->num_xso; @@ -376,8 +376,6 @@ void ossl_quic_free(SSL *s) return; } - quic_lock(ctx.qc); - /* * Free the default XSO, if any. The QUIC_STREAM is not deleted at this * stage, but is freed during the channel free when the whole QSM is freed. @@ -1902,7 +1900,7 @@ QUIC_TAKES_LOCK static size_t ossl_quic_pending_int(const SSL *s) { QCTX ctx; - size_t avail = 0; + size_t avail; int fin = 0; if (!expect_quic_with_stream_lock(s, /*remote_init=*/-1, &ctx)) |