Bjørn Lie
5b8cb29a58
(boo#1233285 CVE-2024-52530 glgo#GNOME/libsoup#377). - Add libsoup-CVE-2024-52532.patch: websocket: Process the frame as soon as we read data (boo#1233287 CVE-2024-52532). - Add 29b96fab.patch: websocket-test: disconnect error copy after the test ends (glgo#GNOME/libsoup#391). - Add a35222dd.patch: be more robust against invalid input when parsing params (boo#1233292 CVE-2024-52531 glgo#GNOME/libsoup!407). OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libsoup2?expand=0&rev=13
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From 29b96fab2512666d7241e46c98cc45b60b795c0c Mon Sep 17 00:00:00 2001
|
|
From: Ignacio Casal Quinteiro <qignacio@amazon.com>
|
|
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
|
|
---
|
|
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 06c443bb5..6a48c1f9b 100644
|
|
--- a/tests/websocket-test.c
|
|
+++ b/tests/websocket-test.c
|
|
@@ -1539,8 +1539,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 */
|
|
@@ -1553,6 +1554,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);
|
|
--
|
|
GitLab
|
|
|