From d97bb2e340f5a6d7e56a7738403f9d18bc406b70 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 13 Nov 2024 14:14:23 +0000 Subject: [PATCH 3/3] websocket-test: Disconnect error signal in another place This is the same change as commit 29b96fab "websocket-test: disconnect error copy after the test ends", and is done for the same reason, but replicating it into a different function. Fixes: 6adc0e3e "websocket: process the frame as soon as we read data" Resolves: https://gitlab.gnome.org/GNOME/libsoup/-/issues/399 Signed-off-by: Simon McVittie CVE: CVE-2024-52532 Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/4c9e75c6676a37b6485620c332e568e1a3f530ff] Signed-off-by: Changqing Li --- tests/websocket-test.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/websocket-test.c b/tests/websocket-test.c index 2b19a7b..0699a06 100644 --- a/tests/websocket-test.c +++ b/tests/websocket-test.c @@ -1300,8 +1300,9 @@ test_receive_invalid_encode_length_16 (Test *test, GError *error = NULL; InvalidEncodeLengthTest context = { test, NULL }; guint i; + guint error_id; - g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error); + error_id = g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error); g_signal_connect (test->client, "message", G_CALLBACK (on_binary_message), &received); /* We use 126(~) as payload length with 125 extended length */ @@ -1314,6 +1315,7 @@ test_receive_invalid_encode_length_16 (Test *test, WAIT_UNTIL (error != NULL || received != NULL); g_assert_error (error, SOUP_WEBSOCKET_ERROR, SOUP_WEBSOCKET_CLOSE_PROTOCOL_ERROR); g_clear_error (&error); + g_signal_handler_disconnect (test->client, error_id); g_assert_null (received); g_thread_join (thread); -- 2.34.1