system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-16 06:06:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

winhttp: Copy the reason buffer.

Browse source 
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2020-06-29 15:46:11 +02:00 committed by Alexandre Julliard
parent c7d140d34a
commit 7b7fdb8585
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dlls/winhttp/request.c
View file

@ -3463,7 +3463,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r
TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len);
if (len && !reason) return ERROR_INVALID_PARAMETER;
if ((len && !reason) || len > sizeof(socket->reason)) return ERROR_INVALID_PARAMETER;
if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE;
if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET)
@ -3484,7 +3484,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r
if (!(s = heap_alloc( sizeof(*s) ))) return FALSE;
s->socket = socket;
s->status = status;
s->reason = reason;
memcpy( s->reason, reason, len );
s->len = len;
addref_object( &socket->hdr );
@ -3569,7 +3569,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas
TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len);
if (len && !reason) return ERROR_INVALID_PARAMETER;
if ((len && !reason) || len > sizeof(socket->reason)) return ERROR_INVALID_PARAMETER;
if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE;
if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET)
@ -3590,7 +3590,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas
if (!(s = heap_alloc( sizeof(*s) ))) return FALSE;
s->socket = socket;
s->status = status;
s->reason = reason;
memcpy( s->reason, reason, len );
s->len = len;
addref_object( &socket->hdr );

6
dlls/winhttp/tests/winhttp.c
View file

@ -3356,6 +3356,9 @@ static void test_websocket(int port)
error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 1);
ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error);
error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, buf, sizeof(buf));
ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error);
error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, (void *)"success",
sizeof("success"));
ok(!error, "got %u\n", error);
@ -3363,6 +3366,9 @@ static void test_websocket(int port)
error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 1);
ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error);
error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, buf, sizeof(buf));
ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error);
error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, (void *)"success2",
sizeof("success2"));
ok(!error, "got %u\n", error);

4
dlls/winhttp/winhttp_private.h
View file

@ -244,7 +244,7 @@ struct socket
enum socket_opcode opcode;
DWORD read_size;
USHORT status;
char reason[128];
char reason[123];
DWORD reason_len;
};
@ -305,7 +305,7 @@ struct socket_shutdown
{
struct socket *socket;
USHORT status;
const void *reason;
char reason[123];
DWORD len;
};