From: Daniel P. Berrangé <[email protected]> While code is supposed to call qio_channel_close() before releasing the last reference on an QIOChannel, this is not guaranteed. QIOChannelFile and QIOChannelSocket both cleanup resources in their finalizer if the close operation was missed.
This ensures the TLS channel will do the same failsafe cleanup. Reviewed-by: Eric Blake <[email protected]> Signed-off-by: Daniel P. Berrangé <[email protected]> (cherry picked from commit 2c147611cf568eb1cd7dc8bf4479b272bad3b9d6) (Mjt: remove releasing of ioc->bye_ioc_tag due to missing in 7.2.x v9.2.0-1773-g30ee88622edf "io: tls: Add qio_channel_tls_bye") Signed-off-by: Michael Tokarev <[email protected]> diff --git a/io/channel-tls.c b/io/channel-tls.c index 686271acf7..3b3934db72 100644 --- a/io/channel-tls.c +++ b/io/channel-tls.c @@ -255,6 +255,11 @@ static void qio_channel_tls_finalize(Object *obj) { QIOChannelTLS *ioc = QIO_CHANNEL_TLS(obj); + if (ioc->hs_ioc_tag) { + trace_qio_channel_tls_handshake_cancel(ioc); + g_clear_handle_id(&ioc->hs_ioc_tag, g_source_remove); + } + object_unref(OBJECT(ioc->master)); qcrypto_tls_session_free(ioc->session); } -- 2.47.3
