37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From 6adc0e3eb74c257ed4e2a23eb4b2774fdb0d67be Mon Sep 17 00:00:00 2001
|
|
From: Ignacio Casal Quinteiro <qignacio@amazon.com>
|
|
Date: Wed, 11 Sep 2024 11:52:11 +0200
|
|
Subject: [PATCH] websocket: process the frame as soon as we read data
|
|
|
|
Otherwise we can enter in a read loop because we were not
|
|
validating the data until the all the data was read.
|
|
|
|
Fixes #391
|
|
|
|
Conflict: context adapt and libsoup/websocket/soup-websocket-connection.c -> libsoup/soup-websocket-connection.c
|
|
Reference: https://gitlab.gnome.org/GNOME/libsoup/-/commit/6adc0e3eb74c257ed4e2a23eb4b2774fdb0d67be
|
|
|
|
---
|
|
libsoup/soup-websocket-connection.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libsoup/soup-websocket-connection.c b/libsoup/soup-websocket-connection.c
|
|
index a4095e1..ed54e6b 100644
|
|
--- a/libsoup/soup-websocket-connection.c
|
|
+++ b/libsoup/soup-websocket-connection.c
|
|
@@ -1140,9 +1140,9 @@ soup_websocket_connection_read (SoupWebsocketConnection *self)
|
|
}
|
|
|
|
pv->incoming->len = len + count;
|
|
- } while (count > 0);
|
|
|
|
- process_incoming (self);
|
|
+ process_incoming (self);
|
|
+ } while (count > 0 && !pv->close_sent && !pv->io_closing);
|
|
|
|
if (end) {
|
|
if (!pv->close_sent || !pv->close_received) {
|
|
--
|
|
2.46.0
|
|
|