mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cliprdr: Fix sending of server-side PDUs

Browse Source 
The old implementation used `Stream_GetLength` to obtain the amount of
data to send. However some PDUs (i.e. CLIPRDR_FILECONTENTS_REQUEST) are
overallocated as they contain optional data (clipDataId in this case).

We now use the position to determine the actual data written to the PDU
instead of the amount of bytes allocated, avoid sending garbage data to
the client.
This commit is contained in:
Martin Fleisz 2023-01-03 13:54:58 +01:00 committed by akallabeth
parent 8d02a07974
commit 8d917698ea
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
channels/cliprdr/server/cliprdr_main.c
View File

@ -78,7 +78,7 @@
static UINT cliprdr_server_packet_send(CliprdrServerPrivate* cliprdr, wStream* s) static UINT cliprdr_server_packet_send(CliprdrServerPrivate* cliprdr, wStream* s)
{ {
UINT rc; UINT rc;
size_t pos, size; size_t pos;
BOOL status; BOOL status;
UINT32 dataLen; UINT32 dataLen;
ULONG written; ULONG written;
@ -95,15 +95,13 @@ static UINT cliprdr_server_packet_send(CliprdrServerPrivate* cliprdr, wStream* s
dataLen = (UINT32)(pos - 8); dataLen = (UINT32)(pos - 8);
Stream_SetPosition(s, 4); Stream_SetPosition(s, 4);
Stream_Write_UINT32(s, dataLen); Stream_Write_UINT32(s, dataLen);
Stream_SetPosition(s, pos); if (pos > UINT32_MAX)
size = Stream_Length(s);
if (size > UINT32_MAX)
{ {
rc = ERROR_INVALID_DATA; rc = ERROR_INVALID_DATA;
goto fail; goto fail;
} }
status = WTSVirtualChannelWrite(cliprdr->ChannelHandle, (PCHAR)Stream_Buffer(s), (UINT32)size, status = WTSVirtualChannelWrite(cliprdr->ChannelHandle, (PCHAR)Stream_Buffer(s), (UINT32)pos,
&written); &written);
rc = status ? CHANNEL_RC_OK : ERROR_INTERNAL_ERROR; rc = status ? CHANNEL_RC_OK : ERROR_INTERNAL_ERROR;
fail: fail: