[PATCH 6/7] winhttp: Don't allow socket transfers after receiving close frame.
Paul Gofman
pgofman at codeweavers.com
Thu Jan 27 17:06:30 CST 2022
Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
---
dlls/winhttp/request.c | 14 ++++++++++++--
dlls/winhttp/tests/notification.c | 3 +++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
index 04df90f74d7..a61355da7b9 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -3287,6 +3287,16 @@ static BOOL receive_io_complete( struct socket *socket )
return count >= 0;
}
+static BOOL socket_can_send( struct socket *socket )
+{
+ return socket->state == SOCKET_STATE_OPEN && !socket->close_frame_received;
+}
+
+static BOOL socket_can_receive( struct socket *socket )
+{
+ return socket->state <= SOCKET_STATE_SHUTDOWN && !socket->close_frame_received;
+}
+
static enum socket_opcode map_buffer_type( WINHTTP_WEB_SOCKET_BUFFER_TYPE type )
{
switch (type)
@@ -3364,7 +3374,7 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_
release_object( &socket->hdr );
return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE;
}
- if (socket->state != SOCKET_STATE_OPEN)
+ if (!socket_can_send( socket ))
{
release_object( &socket->hdr );
return ERROR_INVALID_OPERATION;
@@ -3723,7 +3733,7 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D
release_object( &socket->hdr );
return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE;
}
- if (socket->state > SOCKET_STATE_SHUTDOWN)
+ if (!socket_can_receive( socket ))
{
release_object( &socket->hdr );
return ERROR_INVALID_OPERATION;
diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c
index 3dc94a909b4..fabc5a03a46 100644
--- a/dlls/winhttp/tests/notification.c
+++ b/dlls/winhttp/tests/notification.c
@@ -1132,6 +1132,9 @@ static void test_websocket(BOOL secure)
ok( close_status == 1000, "got %u\n", close_status );
ok( size <= sizeof(buffer), "got %u\n", size );
+ err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type );
+ ok( err == ERROR_INVALID_OPERATION, "got %u\n", err );
+
info.buflen = 0xdeadbeef;
setup_test( &info, winhttp_websocket_close, __LINE__ );
err = pWinHttpWebSocketClose( socket, 1000, (void *)"success", sizeof("success") );
--
2.34.1
More information about the wine-devel
mailing list