From 7b8bbd7fd9389e32abb761fb1d05eaf2e936d94b Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Thu, 8 Jan 2026 11:31:55 +0100 Subject: [PATCH] [clang,warnings] fix Wjump-misses-init --- libfreerdp/core/connection.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/libfreerdp/core/connection.c b/libfreerdp/core/connection.c index 8f4970ad7..b06bb09f2 100644 --- a/libfreerdp/core/connection.c +++ b/libfreerdp/core/connection.c @@ -724,7 +724,6 @@ static const BYTE fips_ivec[8] = { 0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xE static BOOL rdp_client_establish_keys(rdpRdp* rdp) { wStream* s = NULL; - int status = 0; BOOL ret = FALSE; WINPR_ASSERT(rdp); @@ -779,22 +778,26 @@ static BOOL rdp_client_establish_keys(rdpRdp* rdp) goto end; } - UINT16 sec_flags = SEC_EXCHANGE_PKT | SEC_LICENSE_ENCRYPT_SC; - if (!rdp_write_header(rdp, s, length, MCS_GLOBAL_CHANNEL_ID, sec_flags)) - goto end; - if (!rdp_write_security_header(rdp, s, sec_flags)) - goto end; + { + const UINT16 sec_flags = SEC_EXCHANGE_PKT | SEC_LICENSE_ENCRYPT_SC; + if (!rdp_write_header(rdp, s, length, MCS_GLOBAL_CHANNEL_ID, sec_flags)) + goto end; + if (!rdp_write_security_header(rdp, s, sec_flags)) + goto end; + } Stream_Write_UINT32(s, info->ModulusLength + 8); Stream_Write(s, crypt_client_random, info->ModulusLength); Stream_Zero(s, 8); Stream_SealLength(s); - rdpTransport* transport = freerdp_get_transport(rdp->context); - status = transport_write(transport, s); + { + rdpTransport* transport = freerdp_get_transport(rdp->context); + const int status = transport_write(transport, s); - if (status < 0) - goto end; + if (status < 0) + goto end; + } rdp->do_crypt_license = TRUE;