github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[proxy,rdpdr] fix boroken logger calls

Browse Source
This commit is contained in:
akallabeth 2023-06-29 15:58:08 +02:00 committed by akallabeth
parent d71565eefd
commit be7ff37069
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
server/proxy/channels/pf_channel_rdpdr.c
View File

@ -1197,7 +1197,7 @@ static BOOL filter_smartcard_io_requests(pf_channel_client_context* rdpdr, wStre
WINPR_ASSERT(rdpdr); WINPR_ASSERT(rdpdr);
WINPR_ASSERT(pPacketid); WINPR_ASSERT(pPacketid);
if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) if (!Stream_CheckAndLogRequiredLengthWLog(rdpdr->log, s, 4))
return FALSE; return FALSE;
pos = Stream_GetPosition(s); pos = Stream_GetPosition(s);
@ -1531,7 +1531,8 @@ static BOOL filter_smartcard_device_list_remove(pf_channel_server_context* rdpdr
size_t pos; size_t pos;
UINT32 x, count; UINT32 x, count;
if (!Stream_CheckAndLogRequiredLength(TAG, s, sizeof(UINT32))) WINPR_ASSERT(rdpdr);
if (!Stream_CheckAndLogRequiredLengthWLog(rdpdr->log, s, sizeof(UINT32)))
return TRUE; return TRUE;
pos = Stream_GetPosition(s); pos = Stream_GetPosition(s);
Stream_Read_UINT32(s, count); Stream_Read_UINT32(s, count);
@ -1539,7 +1540,7 @@ static BOOL filter_smartcard_device_list_remove(pf_channel_server_context* rdpdr
if (count == 0) if (count == 0)
return TRUE; return TRUE;
if (!Stream_CheckAndLogRequiredLengthOfSize(TAG, s, count, sizeof(UINT32))) if (!Stream_CheckAndLogRequiredLengthOfSizeWLog(rdpdr->log, s, count, sizeof(UINT32)))
return TRUE; return TRUE;
for (x = 0; x < count; x++) for (x = 0; x < count; x++)
@ -1579,25 +1580,25 @@ static BOOL filter_smartcard_device_io_request(pf_channel_server_context* rdpdr,
static BOOL filter_smartcard_device_list_announce(pf_channel_server_context* rdpdr, wStream* s) static BOOL filter_smartcard_device_list_announce(pf_channel_server_context* rdpdr, wStream* s)
{ {
size_t pos; UINT32 count;
UINT32 x, count;
if (!Stream_CheckAndLogRequiredLength(TAG, s, sizeof(UINT32))) WINPR_ASSERT(rdpdr);
if (!Stream_CheckAndLogRequiredLengthWLog(rdpdr->log, s, sizeof(UINT32)))
return TRUE; return TRUE;
pos = Stream_GetPosition(s); const size_t pos = Stream_GetPosition(s);
Stream_Read_UINT32(s, count); Stream_Read_UINT32(s, count);
if (count == 0) if (count == 0)
return TRUE; return TRUE;
for (x = 0; x < count; x++) for (UINT32 x = 0; x < count; x++)
{ {
UINT32 DeviceType; UINT32 DeviceType;
UINT32 DeviceId; UINT32 DeviceId;
char PreferredDosName[8]; char PreferredDosName[8];
UINT32 DeviceDataLength; UINT32 DeviceDataLength;
BYTE* dst = Stream_Pointer(s); BYTE* dst = Stream_Pointer(s);
if (!Stream_CheckAndLogRequiredLength(TAG, s, 20)) if (!Stream_CheckAndLogRequiredLengthWLog(rdpdr->log, s, 20))
return TRUE; return TRUE;
Stream_Read_UINT32(s, DeviceType); Stream_Read_UINT32(s, DeviceType);
Stream_Read_UINT32(s, DeviceId); Stream_Read_UINT32(s, DeviceId);
@ -1631,7 +1632,8 @@ static BOOL filter_smartcard_device_list_announce_request(pf_channel_server_cont
size_t pos; size_t pos;
UINT16 component, packetid; UINT16 component, packetid;
if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) WINPR_ASSERT(rdpdr);
if (!Stream_CheckAndLogRequiredLengthWLog(rdpdr->log, s, 8))
return FALSE; return FALSE;
pos = Stream_GetPosition(s); pos = Stream_GetPosition(s);