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

[common,settings] fix add_string_or_null

Browse Source 
* If the value is NULL do not check WINPR_JSON_AddNullToObject return as
  that is most likely also NULL
* Fix testcase, always use goto for error handling
This commit is contained in:
Armin Novak
2025-04-23 09:30:49 +02:00
parent 3532cc0dc9
commit 6a20b7bfd8
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libfreerdp/common/settings.c
View File

@@ -2616,7 +2616,8 @@ static BOOL add_string_or_null(WINPR_JSON* json, const char* key, const char* va
if (value)
return WINPR_JSON_AddStringToObject(json, key, value) != NULL;
return WINPR_JSON_AddNullToObject(json, key) != NULL;
(void)WINPR_JSON_AddNullToObject(json, key);
return TRUE;
}
static WINPR_JSON* json_from_device_item(const RDPDR_DEVICE* val)