mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[core] fix cast warnings

This commit is contained in:
Armin Novak 2023-07-28 09:06:53 +02:00 committed by akallabeth
parent 9d5e95c60b
commit 077aff0217
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libfreerdp/core/fastpath.c
View File

@ -231,7 +231,11 @@ BOOL fastpath_read_header_rdp(rdpFastPath* fastpath, wStream* s, UINT16* length)
if (!per_read_length(s, length))
return FALSE;
*length = *length - Stream_GetPosition(s);
const size_t pos = Stream_GetPosition(s);
if (pos > *length)
return FALSE;
*length = *length - (UINT16)pos;
return TRUE;
}
@ -921,11 +925,8 @@ wStream* fastpath_input_pdu_init(rdpFastPath* fastpath, BYTE eventFlags, BYTE ev
BOOL fastpath_send_multiple_input_pdu(rdpFastPath* fastpath, wStream* s, size_t iNumEvents)
{
CONNECTION_STATE state;
BOOL rc = FALSE;
rdpRdp* rdp;
size_t length;
BYTE eventHeader;
BYTE eventHeader = 0;
WINPR_ASSERT(iNumEvents > 0);
if (!s)
@ -934,10 +935,10 @@ BOOL fastpath_send_multiple_input_pdu(rdpFastPath* fastpath, wStream* s, size_t
if (!fastpath)
goto fail;
rdp = fastpath->rdp;
rdpRdp* rdp = fastpath->rdp;
WINPR_ASSERT(rdp);
state = rdp_get_state(rdp);
CONNECTION_STATE state = rdp_get_state(rdp);
if (!rdp_is_active_state(rdp))
{
WLog_WARN(TAG, "called before activation [%s]", rdp_state_string(state));
@ -952,7 +953,7 @@ BOOL fastpath_send_multiple_input_pdu(rdpFastPath* fastpath, wStream* s, size_t
if (iNumEvents > 15)
goto fail;
length = Stream_GetPosition(s);
size_t length = Stream_GetPosition(s);
if (length >= (2 << 14))
{
@ -1042,8 +1043,9 @@ BOOL fastpath_send_multiple_input_pdu(rdpFastPath* fastpath, wStream* s, size_t
* because we can leave room for fixed-length header, store all
* the data first and then store the header.
*/
WINPR_ASSERT(length < UINT16_MAX);
Stream_SetPosition(s, 1);
Stream_Write_UINT16_BE(s, 0x8000 | length);
Stream_Write_UINT16_BE(s, 0x8000 | (UINT16)length);
Stream_SetPosition(s, length);
Stream_SealLength(s);

10
libfreerdp/core/streamdump.c
View File

@ -355,7 +355,15 @@ static int stream_dump_replay_transport_read(rdpTransport* transport, wStream* s
WLog_ERR("abc", "replay read %" PRIuz, size);
if (slp > 0)
Sleep(slp);
{
size_t duration = slp;
do
{
const DWORD actual = (DWORD)MIN(duration, UINT32_MAX);
Sleep(actual);
duration -= actual;
} while (duration > 0);
}
return 1;
}