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

Merge pull request #11522 from akallabeth/test-fix

Browse Source 
[common,settings] fix add_string_or_null
This commit is contained in:
akallabeth
2025-04-23 10:01:22 +02:00
committed by GitHub
parent 3532cc0dc9 6a20b7bfd8
commit 929bad366b
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)

4
libfreerdp/core/test/TestSettings.c
View File

@@ -1718,7 +1718,7 @@ static BOOL test_serialize_pointer(DWORD flags)
{
rdpSettings* src = freerdp_settings_new(flags);
if (!src)
return FALSE;
goto fail;
const char* argv1[] = { "foobar", "lala", "haha" };
const char* argv2[] = { "lala", "haha" };
@@ -1775,7 +1775,7 @@ static BOOL test_serialize_pointer(DWORD flags)
void* ptr = NULL;
winpr_RAND((void*)&ptr, sizeof(void*));
if (!freerdp_settings_set_pointer(src, FreeRDP_instance, ptr))
return FALSE;
goto fail;
if (!set_private_key(src))
goto fail;