morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

[clang,warnings] fix Wjump-misses-init

Browse Source
This commit is contained in:
Armin Novak
2026-01-08 10:32:29 +01:00
parent 070e2a2ea6
commit 71b113ceb0
1 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
client/common/client.c
View File

@@ -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;