Skip to content

W
wine-winehq
Commit 67252dec authored by Paul Gofman's avatar Paul Gofman Committed by Alexandre Julliard
Browse files
Options

winhttp: Append mask to output frame even if buffer length is zero.

Signed-off-by: 's avatarPaul Gofman <pgofman@codeweavers.com> Signed-off-by: 's avatarHans Leidekker <hans@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent f88507a4
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 9 deletions
dlls/winhttp/request.c
View file @ 67252dec
...@@ -3174,8 +3174,7 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR ...@@ -3174,8 +3174,7 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR
offset += 8; offset += 8;
} }
buffer_size = len + offset; buffer_size = len + offset + 4;
if (len) buffer_size += 4;
assert( buffer_size - len < MAX_FRAME_BUFFER_SIZE ); assert( buffer_size - len < MAX_FRAME_BUFFER_SIZE );
if (ovr && buffer_size > MAX_FRAME_BUFFER_SIZE) return WSAEWOULDBLOCK; if (ovr && buffer_size > MAX_FRAME_BUFFER_SIZE) return WSAEWOULDBLOCK;
if (buffer_size > socket->send_frame_buffer_size && socket->send_frame_buffer_size < MAX_FRAME_BUFFER_SIZE) if (buffer_size > socket->send_frame_buffer_size && socket->send_frame_buffer_size < MAX_FRAME_BUFFER_SIZE)
...@@ -3196,13 +3195,11 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR ...@@ -3196,13 +3195,11 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR
memcpy(ptr, hdr, offset); memcpy(ptr, hdr, offset);
ptr += offset; ptr += offset;
if (len)
{ mask = &hdr[offset];
mask = &hdr[offset]; RtlGenRandom( mask, 4 );
RtlGenRandom( mask, 4 ); memcpy( ptr, mask, 4 );
memcpy( ptr, mask, 4 ); ptr += 4;
ptr += 4;
}
if (opcode == SOCKET_OPCODE_CLOSE) /* prepend status code */ if (opcode == SOCKET_OPCODE_CLOSE) /* prepend status code */
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment