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

Merge pull request #408 from pjd/fixes

Browse Source 
The fastpath header can be two or three bytes long. Check also for the latter case.
This commit is contained in:
Marc-André Moreau 2012-02-08 07:29:11 -08:00
commit 9951cdce12
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libfreerdp-core/fastpath.c
View File

@ -42,13 +42,28 @@
#define FASTPATH_MAX_PACKET_SIZE 0x3FFF
/*
* The fastpath header may be two or three bytes long.
* This function assumes that at least two bytes are available in the stream
* and doesn't touch third byte.
*/
uint16 fastpath_header_length(STREAM* s)
{
uint8 length1;
stream_seek_uint8(s);
stream_read_uint8(s, length1);
stream_rewind(s, 2);
return ((length1 & 0x80) != 0 ? 3 : 2);
}
/**
* Read a Fast-Path packet header.\n
* @param s stream
* @param encryptionFlags
* @return length
*/
uint16 fastpath_read_header(rdpFastPath* fastpath, STREAM* s)
{
uint8 header;

1
libfreerdp-core/fastpath.h
View File

@ -102,6 +102,7 @@ struct rdp_fastpath
STREAM* updateData;
};
uint16 fastpath_header_length(STREAM* s);
uint16 fastpath_read_header(rdpFastPath* fastpath, STREAM* s);
uint16 fastpath_read_header_rdp(rdpFastPath* fastpath, STREAM* s);
boolean fastpath_recv_updates(rdpFastPath* fastpath, STREAM* s);

7
libfreerdp-core/transport.c
View File

@ -312,6 +312,13 @@ int transport_check_fds(rdpTransport* transport)
stream_set_pos(transport->recv_buffer, pos);
return 0;
}
/* Fastpath header can be two or three bytes long. */
length = fastpath_header_length(transport->recv_buffer);
if (pos < length)
{
stream_set_pos(transport->recv_buffer, pos);
return 0;
}
length = fastpath_read_header(NULL, transport->recv_buffer);
}