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

[assert] fix ULONG_MAX use 

most of the time this was used to check ULONG limits. Replace with
correct UINT32_MAX
This commit is contained in:
akallabeth 2024-09-16 06:45:05 +02:00
parent bb242b9a89
commit a19305569d
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/ainput/server/ainput_main.c
View File

@ -176,7 +176,7 @@ static UINT ainput_server_send_version(ainput_server* ainput)
Stream_Write_UINT32(s, AINPUT_VERSION_MAJOR); /* Version (4 bytes) */
Stream_Write_UINT32(s, AINPUT_VERSION_MINOR); /* Version (4 bytes) */
WINPR_ASSERT(Stream_GetPosition(s) <= ULONG_MAX);
WINPR_ASSERT(Stream_GetPosition(s) <= UINT32_MAX);
if (!WTSVirtualChannelWrite(ainput->ainput_channel, (PCHAR)Stream_Buffer(s),
(ULONG)Stream_GetPosition(s), &written))
{

2
channels/audin/client/audin_main.c
View File

@ -113,7 +113,7 @@ static UINT audin_channel_write_and_free(AUDIN_CHANNEL_CALLBACK* callback, wStre
return ERROR_INTERNAL_ERROR;
Stream_SealLength(out);
WINPR_ASSERT(Stream_Length(out) <= ULONG_MAX);
WINPR_ASSERT(Stream_Length(out) <= UINT32_MAX);
const UINT error = callback->channel->Write(callback->channel, (ULONG)Stream_Length(out),
Stream_Buffer(out), NULL);

2
channels/audin/server/audin.c
View File

@ -378,7 +378,7 @@ static DWORD WINAPI audin_server_thread_func(LPVOID arg)
if (!Stream_EnsureRemainingCapacity(s, BytesReturned))
break;
WINPR_ASSERT(Stream_Capacity(s) <= ULONG_MAX);
WINPR_ASSERT(Stream_Capacity(s) <= UINT32_MAX);
if (WTSVirtualChannelRead(audin->audin_channel, 0, (PCHAR)Stream_Buffer(s),
(ULONG)Stream_Capacity(s), &BytesReturned) == FALSE)
{

4
channels/rdpdr/server/rdpdr_main.c
View File

@ -215,7 +215,7 @@ static UINT rdpdr_seal_send_free_request(RdpdrServerContext* context, wStream* s
Stream_SealLength(s);
length = Stream_Length(s);
WINPR_ASSERT(length <= ULONG_MAX);
WINPR_ASSERT(length <= UINT32_MAX);
Stream_SetPosition(s, 0);
if (length >= RDPDR_HEADER_LENGTH)
@ -2077,7 +2077,7 @@ static DWORD WINAPI rdpdr_server_thread(LPVOID arg)
break;
}
capacity = MIN(Stream_Capacity(s), ULONG_MAX);
capacity = MIN(Stream_Capacity(s), UINT32_MAX);
if (!WTSVirtualChannelRead(context->priv->ChannelHandle, 0, (PCHAR)Stream_Buffer(s),
(ULONG)capacity, &BytesReturned))
{

2
libfreerdp/core/nla.c
View File

@ -177,7 +177,7 @@ static BOOL nla_sec_buffer_alloc(SecBuffer* buffer, size_t size)
{
WINPR_ASSERT(buffer);
sspi_SecBufferFree(buffer);
if (size > ULONG_MAX)
if (size > UINT32_MAX)
return FALSE;
if (!sspi_SecBufferAlloc(buffer, (ULONG)size))
return FALSE;

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

@ -259,7 +259,7 @@ static UINT rdpdr_seal_send_free_request(pf_channel_server_context* context, wSt
Stream_SealLength(s);
len = Stream_Length(s);
WINPR_ASSERT(len <= ULONG_MAX);
WINPR_ASSERT(len <= UINT32_MAX);
rdpdr_dump_send_packet(context->log, WLOG_TRACE, s, proxy_client_tx);
status = WTSVirtualChannelWrite(context->handle, (char*)Stream_Buffer(s), (ULONG)len, NULL);

2
winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c
View File

@ -135,7 +135,7 @@ ULONG ntlm_av_pair_list_length(NTLM_AV_PAIR* pAvPairList, size_t cbAvPairList)
return 0;
const size_t size = ((PBYTE)pAvPair - (PBYTE)pAvPairList) + sizeof(NTLM_AV_PAIR);
WINPR_ASSERT(size <= ULONG_MAX);
WINPR_ASSERT(size <= UINT32_MAX);
WINPR_ASSERT(size >= 0);
return (ULONG)size;
}

10
winpr/libwinpr/sspi/NTLM/ntlm_message.c
View File

@ -544,7 +544,7 @@ SECURITY_STATUS ntlm_read_NegotiateMessage(NTLM_CONTEXT* context, PSecBuffer buf
return SEC_E_INVALID_TOKEN;
length = Stream_GetPosition(s);
WINPR_ASSERT(length <= ULONG_MAX);
WINPR_ASSERT(length <= UINT32_MAX);
buffer->cbBuffer = (ULONG)length;
if (!sspi_SecBufferAlloc(&context->NegotiateMessage, (ULONG)length))
@ -634,7 +634,7 @@ SECURITY_STATUS ntlm_write_NegotiateMessage(NTLM_CONTEXT* context, const PSecBuf
}
length = Stream_GetPosition(s);
WINPR_ASSERT(length <= ULONG_MAX);
WINPR_ASSERT(length <= UINT32_MAX);
buffer->cbBuffer = (ULONG)length;
if (!sspi_SecBufferAlloc(&context->NegotiateMessage, (ULONG)length))
@ -895,7 +895,7 @@ SECURITY_STATUS ntlm_write_ChallengeMessage(NTLM_CONTEXT* context, const PSecBuf
}
length = Stream_GetPosition(s);
WINPR_ASSERT(length <= ULONG_MAX);
WINPR_ASSERT(length <= UINT32_MAX);
buffer->cbBuffer = (ULONG)length;
if (!sspi_SecBufferAlloc(&context->ChallengeMessage, (ULONG)length))
@ -1043,7 +1043,7 @@ SECURITY_STATUS ntlm_read_AuthenticateMessage(NTLM_CONTEXT* context, PSecBuffer
}
length = Stream_GetPosition(s);
WINPR_ASSERT(length <= ULONG_MAX);
WINPR_ASSERT(length <= UINT32_MAX);
if (!sspi_SecBufferAlloc(&context->AuthenticateMessage, (ULONG)length))
goto fail;
@ -1368,7 +1368,7 @@ SECURITY_STATUS ntlm_write_AuthenticateMessage(NTLM_CONTEXT* context, const PSec
}
length = Stream_GetPosition(s);
WINPR_ASSERT(length <= ULONG_MAX);
WINPR_ASSERT(length <= UINT32_MAX);
if (!sspi_SecBufferAlloc(&context->AuthenticateMessage, (ULONG)length))
return SEC_E_INTERNAL_ERROR;