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

[core,arm] fix optional string redirectedUsername

Browse Source 
json-c does return NULL from WINPR_JSON_GetObjectItemCaseSensitive if
the value is NULL, so do a check with WINPR_JSON_HasObjectItem first.
This commit is contained in:
Armin Novak
2025-09-23 12:32:42 +02:00
parent 6cfdf9e43e
commit eebd570d1b
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libfreerdp/core/gateway/arm.c
View File

@@ -899,12 +899,17 @@ static BOOL arm_fill_gateway_parameters(rdpArm* arm, const char* message, size_t
}
}
WINPR_JSON* userNameNode = WINPR_JSON_GetObjectItemCaseSensitive(json, "redirectedUserName");
if (userNameNode)
{
const char* userName = WINPR_JSON_GetStringValue(userNameNode);
if (!freerdp_settings_set_string(settings, FreeRDP_Username, userName))
goto fail;
const char key[] = "redirectedUsername";
if (WINPR_JSON_HasObjectItem(json, key))
{
const char* userName = NULL;
WINPR_JSON* userNameNode = WINPR_JSON_GetObjectItemCaseSensitive(json, key);
if (userNameNode)
userName = WINPR_JSON_GetStringValue(userNameNode);
if (!freerdp_settings_set_string(settings, FreeRDP_Username, userName))
goto fail;
}
}
WINPR_JSON* azureMeta =