From f5b76410de1318f49844dacf6e68692522b6c856 Mon Sep 17 00:00:00 2001 From: Ignacio Casal Quinteiro Date: Wed, 2 Oct 2024 11:17:19 +0200 Subject: [PATCH] websocket-test: disconnect error copy after the test ends Otherwise the server will have already sent a few more wrong bytes and the client will continue getting errors to copy but the error is already != NULL and it will assert CVE: CVE-2024-52532 Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/29b96fab2512666d7241e46c98cc45b60b795c0c] Signed-off-by: Changqing Li --- tests/websocket-test.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/websocket-test.c b/tests/websocket-test.c index 5e40cf3..1ec9ff6 100644 --- a/tests/websocket-test.c +++ b/tests/websocket-test.c @@ -1331,8 +1331,9 @@ test_receive_invalid_encode_length_64 (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 127(\x7f) as payload length with 65535 extended length */ @@ -1345,6 +1346,7 @@ test_receive_invalid_encode_length_64 (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