From 71b113ceb093a126101a39b7bb312192e816413c Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Thu, 8 Jan 2026 10:32:29 +0100 Subject: [PATCH] [clang,warnings] fix Wjump-misses-init --- client/common/client.c | 48 ++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/client/common/client.c b/client/common/client.c index f62ebdb56..6a24ddffd 100644 --- a/client/common/client.c +++ b/client/common/client.c @@ -1098,13 +1098,14 @@ static BOOL client_cli_get_rdsaad_access_token(freerdp* instance, const char* sc if (freerdp_interruptible_get_line(instance->context, &url, &size, stdin) < 0) goto cleanup; - const char* code = extract_authorization_code(url); - if (!code) - goto cleanup; - - token_request = - freerdp_client_get_aad_url((rdpClientContext*)instance->context, - FREERDP_CLIENT_AAD_TOKEN_REQUEST, scope, code, req_cnf); + { + const char* code = extract_authorization_code(url); + if (!code) + goto cleanup; + token_request = + freerdp_client_get_aad_url((rdpClientContext*)instance->context, + FREERDP_CLIENT_AAD_TOKEN_REQUEST, scope, code, req_cnf); + } if (!token_request) goto cleanup; @@ -1142,12 +1143,13 @@ static BOOL client_cli_get_avd_access_token(freerdp* instance, char** token) if (freerdp_interruptible_get_line(instance->context, &url, &size, stdin) < 0) goto cleanup; - const char* code = extract_authorization_code(url); - if (!code) - goto cleanup; - - token_request = freerdp_client_get_aad_url((rdpClientContext*)instance->context, - FREERDP_CLIENT_AAD_AVD_TOKEN_REQUEST, code); + { + const char* code = extract_authorization_code(url); + if (!code) + goto cleanup; + token_request = freerdp_client_get_aad_url((rdpClientContext*)instance->context, + FREERDP_CLIENT_AAD_AVD_TOKEN_REQUEST, code); + } if (!token_request) goto cleanup; @@ -2442,15 +2444,21 @@ static char* aad_auth_request(rdpClientContext* cctx, WINPR_ATTR_UNUSED va_list const char* client_id = freerdp_settings_get_string(settings, FreeRDP_GatewayAvdClientID); if (!client_id || !redirect_uri) goto cleanup; - const char* scope = va_arg(ap, const char*); - if (!scope) - goto cleanup; - const char* ep = freerdp_utils_aad_get_wellknown_string(&cctx->context, - AAD_WELLKNOWN_authorization_endpoint); + { + const char* scope = va_arg(ap, const char*); + if (!scope) + goto cleanup; + + { + const char* ep = freerdp_utils_aad_get_wellknown_string( + &cctx->context, AAD_WELLKNOWN_authorization_endpoint); + winpr_asprintf(&url, &urllen, + "%s?client_id=%s&response_type=code&scope=%s&redirect_uri=%s", ep, + client_id, scope, redirect_uri); + } + } - winpr_asprintf(&url, &urllen, "%s?client_id=%s&response_type=code&scope=%s&redirect_uri=%s", ep, - client_id, scope, redirect_uri); cleanup: free(redirect_uri); return url;