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

[core,rdstls] use less verbose logging

Browse Source 
the rdstls_recv function is called with possibly incomplete data, do not
log length check failures
This commit is contained in:
akallabeth 2024-11-06 20:31:50 +01:00
parent 93c4843399
commit 315ab17984
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libfreerdp/core/rdstls.c
View File

@ -327,7 +327,7 @@ static BOOL rdstls_process_capabilities(rdpRdstls* rdstls, wStream* s)
UINT16 dataType = 0; UINT16 dataType = 0;
UINT16 supportedVersions = 0; UINT16 supportedVersions = 0;
if (!Stream_CheckAndLogRequiredLengthWLog(rdstls->log, s, 4)) if (Stream_GetRemainingLength(s) < 4)
return FALSE; return FALSE;
Stream_Read_UINT16(s, dataType); Stream_Read_UINT16(s, dataType);
@ -357,12 +357,12 @@ static BOOL rdstls_read_unicode_string(wLog* log, wStream* s, char** str)
WINPR_ASSERT(str); WINPR_ASSERT(str);
if (!Stream_CheckAndLogRequiredLengthWLog(log, s, 2)) if (Stream_GetRemainingLength(s) < 2)
return FALSE; return FALSE;
Stream_Read_UINT16(s, length); Stream_Read_UINT16(s, length);
if (!Stream_CheckAndLogRequiredLengthWLog(log, s, length)) if (Stream_GetRemainingLength(s) < length)
return FALSE; return FALSE;
if (length <= 2) if (length <= 2)
@ -387,12 +387,12 @@ static BOOL rdstls_read_data(wLog* log, wStream* s, UINT16* pLength, const BYTE*
*pData = NULL; *pData = NULL;
*pLength = 0; *pLength = 0;
if (!Stream_CheckAndLogRequiredLengthWLog(log, s, 2)) if (Stream_GetRemainingLength(s) < 2)
return FALSE; return FALSE;
Stream_Read_UINT16(s, length); Stream_Read_UINT16(s, length);
if (!Stream_CheckAndLogRequiredLengthWLog(log, s, length)) if (Stream_GetRemainingLength(s) < length)
return FALSE; return FALSE;
if (length <= 2) if (length <= 2)
@ -403,7 +403,8 @@ static BOOL rdstls_read_data(wLog* log, wStream* s, UINT16* pLength, const BYTE*
*pData = Stream_ConstPointer(s); *pData = Stream_ConstPointer(s);
*pLength = length; *pLength = length;
return Stream_SafeSeek(s, length); Stream_Seek(s, length);
return TRUE;
} }
static BOOL rdstls_cmp_data(wLog* log, const char* field, const BYTE* serverData, static BOOL rdstls_cmp_data(wLog* log, const char* field, const BYTE* serverData,
@ -521,7 +522,7 @@ static BOOL rdstls_process_authentication_request(rdpRdstls* rdstls, wStream* s)
{ {
UINT16 dataType = 0; UINT16 dataType = 0;
if (!Stream_CheckAndLogRequiredLengthWLog(rdstls->log, s, 2)) if (Stream_GetRemainingLength(s) < 2)
return FALSE; return FALSE;
Stream_Read_UINT16(s, dataType); Stream_Read_UINT16(s, dataType);
@ -551,7 +552,7 @@ static BOOL rdstls_process_authentication_response(rdpRdstls* rdstls, wStream* s
UINT16 dataType = 0; UINT16 dataType = 0;
UINT32 resultCode = 0; UINT32 resultCode = 0;
if (!Stream_CheckAndLogRequiredLengthWLog(rdstls->log, s, 6)) if (Stream_GetRemainingLength(s) < 6)
return FALSE; return FALSE;
Stream_Read_UINT16(s, dataType); Stream_Read_UINT16(s, dataType);
@ -673,7 +674,7 @@ static int rdstls_recv(rdpTransport* transport, wStream* s, void* extra)
WINPR_ASSERT(s); WINPR_ASSERT(s);
WINPR_ASSERT(rdstls); WINPR_ASSERT(rdstls);
if (!Stream_CheckAndLogRequiredLengthWLog(rdstls->log, s, 4)) if (Stream_GetRemainingLength(s) < 4)
return FALSE; return FALSE;
Stream_Read_UINT16(s, version); Stream_Read_UINT16(s, version);