From f9bfaba0d222fb0d3a95cfd42a571b836e06a725 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Thu, 3 Oct 2024 13:15:24 +0200 Subject: [PATCH] [warnings] fix integer narrowing --- libfreerdp/core/gateway/rdg.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/libfreerdp/core/gateway/rdg.c b/libfreerdp/core/gateway/rdg.c index cd8949883..a58a13448 100644 --- a/libfreerdp/core/gateway/rdg.c +++ b/libfreerdp/core/gateway/rdg.c @@ -1249,7 +1249,7 @@ static BOOL rdg_send_http_request(rdpRdg* rdg, rdpTls* tls, const char* method, sz = Stream_Length(s); if (sz <= INT_MAX) - status = freerdp_tls_write_all(tls, Stream_Buffer(s), (int)sz); + status = freerdp_tls_write_all(tls, Stream_Buffer(s), sz); Stream_Free(s, TRUE); return (status >= 0); @@ -1316,7 +1316,7 @@ static BOOL rdg_tls_connect(rdpRdg* rdg, rdpTls* tls, const char* peerAddress, i } tls->hostname = settings->GatewayHostname; - tls->port = (int)settings->GatewayPort; + tls->port = MIN(UINT16_MAX, settings->GatewayPort); tls->isGatewayTransport = TRUE; status = freerdp_tls_connect(tls, bufferedBio); if (status < 1) @@ -1722,13 +1722,7 @@ static int rdg_write_chunked_data_packet(rdpRdg* rdg, const BYTE* buf, int isize Stream_SealLength(sChunk); len = Stream_Length(sChunk); - if (len > INT_MAX) - { - Stream_Free(sChunk, TRUE); - return -1; - } - - status = freerdp_tls_write_all(rdg->tlsIn, Stream_Buffer(sChunk), (int)len); + status = freerdp_tls_write_all(rdg->tlsIn, Stream_Buffer(sChunk), len); Stream_Free(sChunk, TRUE); if (status < 0)