From a19305569dad90e67dc7ac531ca65c813cc782d1 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Mon, 16 Sep 2024 06:45:05 +0200 Subject: [PATCH] [assert] fix ULONG_MAX use most of the time this was used to check ULONG limits. Replace with correct UINT32_MAX --- channels/ainput/server/ainput_main.c | 2 +- channels/audin/client/audin_main.c | 2 +- channels/audin/server/audin.c | 2 +- channels/rdpdr/server/rdpdr_main.c | 4 ++-- libfreerdp/core/nla.c | 2 +- server/proxy/channels/pf_channel_rdpdr.c | 2 +- winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c | 2 +- winpr/libwinpr/sspi/NTLM/ntlm_message.c | 10 +++++----- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/channels/ainput/server/ainput_main.c b/channels/ainput/server/ainput_main.c index 5659d5163..4da1655ed 100644 --- a/channels/ainput/server/ainput_main.c +++ b/channels/ainput/server/ainput_main.c @@ -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)) { diff --git a/channels/audin/client/audin_main.c b/channels/audin/client/audin_main.c index 01ea72182..66a35a3d4 100644 --- a/channels/audin/client/audin_main.c +++ b/channels/audin/client/audin_main.c @@ -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); diff --git a/channels/audin/server/audin.c b/channels/audin/server/audin.c index 0726632a8..d2da95abc 100644 --- a/channels/audin/server/audin.c +++ b/channels/audin/server/audin.c @@ -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) { diff --git a/channels/rdpdr/server/rdpdr_main.c b/channels/rdpdr/server/rdpdr_main.c index e0fde30a2..8742996f0 100644 --- a/channels/rdpdr/server/rdpdr_main.c +++ b/channels/rdpdr/server/rdpdr_main.c @@ -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)) { diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c index 4c471d36f..9235e80be 100644 --- a/libfreerdp/core/nla.c +++ b/libfreerdp/core/nla.c @@ -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; diff --git a/server/proxy/channels/pf_channel_rdpdr.c b/server/proxy/channels/pf_channel_rdpdr.c index 61e5330e3..402b47481 100644 --- a/server/proxy/channels/pf_channel_rdpdr.c +++ b/server/proxy/channels/pf_channel_rdpdr.c @@ -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); diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c b/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c index b270947a5..9b0d00c66 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c @@ -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; } diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_message.c b/winpr/libwinpr/sspi/NTLM/ntlm_message.c index 511ca4765..4a757fd0f 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_message.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm_message.c @@ -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;