summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Catanzaro <mcatanzaro@igalia.com>2019-05-17 16:34:25 -0500
committerIgnacio Casal Quinteiro <nacho.resa@gmail.com>2019-05-18 19:29:17 +0000
commitfe0fa1c1eb670b1c54282920c378f0b8d7501390 (patch)
tree83931644ff43bf28ad307a9e221f9cfa1bbaf351
parentc1b57906a9592cb86f20a2799c26ee721c2a7f8f (diff)
downloadglib-networking-fe0fa1c1eb670b1c54282920c378f0b8d7501390.tar.gz
base: add missing main context pop after explicit sync handshake
We do have tests to cover explicit sync handshake, but they didn't catch this.
-rw-r--r--tls/base/gtlsconnection-base.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tls/base/gtlsconnection-base.c b/tls/base/gtlsconnection-base.c
index 76defda..bc04e15 100644
--- a/tls/base/gtlsconnection-base.c
+++ b/tls/base/gtlsconnection-base.c
@@ -1522,6 +1522,7 @@ g_tls_connection_base_handshake (GTlsConnection *conn,
g_task_run_in_thread (task, handshake_thread);
crank_sync_handshake_context (tls, cancellable);
+ g_main_context_pop_thread_default (priv->handshake_context);
g_clear_pointer (&priv->handshake_context, g_main_context_unref);
success = finish_handshake (tls, task, &my_error);