You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
97 lines
3.8 KiB
97 lines
3.8 KiB
diff -up libsoup-2.62.3/libsoup/soup-websocket-connection.c.cve-2024-52532 libsoup-2.62.3/libsoup/soup-websocket-connection.c
|
|
--- libsoup-2.62.3/libsoup/soup-websocket-connection.c.cve-2024-52532 2024-11-12 12:00:27.183570627 +0100
|
|
+++ libsoup-2.62.3/libsoup/soup-websocket-connection.c 2024-11-12 12:01:02.334987409 +0100
|
|
@@ -1041,9 +1041,9 @@ soup_websocket_connection_read (SoupWebs
|
|
}
|
|
|
|
pv->incoming->len = len + count;
|
|
- } while (count > 0);
|
|
+ process_incoming (self);
|
|
+ } while (count > 0 && !pv->close_sent && !pv->io_closing);
|
|
|
|
- process_incoming (self);
|
|
|
|
if (end) {
|
|
if (!pv->close_sent || !pv->close_received) {
|
|
|
|
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 2/2] 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 06c443bb..6a48c1f9 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);
|
|
--
|
|
2.45.2
|
|
|
|
From 4c9e75c6676a37b6485620c332e568e1a3f530ff Mon Sep 17 00:00:00 2001
|
|
From: Simon McVittie <smcv@debian.org>
|
|
Date: Wed, 13 Nov 2024 14:14:23 +0000
|
|
Subject: [PATCH] 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 <smcv@debian.org>
|
|
---
|
|
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 6a48c1f9..723f2857 100644
|
|
--- a/tests/websocket-test.c
|
|
+++ b/tests/websocket-test.c
|
|
@@ -1508,8 +1508,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 */
|
|
@@ -1522,6 +1523,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);
|
|
--
|
|
GitLab
|
|
|