mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[common,settings] fix TargetNetAddresses usage 

* use a common function to allocate both, TargetNetAddresses and
  TargetNetPorts
* unify handling, utilize helper functions as much as possible
This commit is contained in:
akallabeth 2024-01-04 15:47:40 +01:00 committed by akallabeth
parent f6a208f75e
commit c2f4ad80a5
4 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libfreerdp/common/assistance.c
View File

@ -37,6 +37,8 @@
#include <freerdp/assistance.h> #include <freerdp/assistance.h>
#include "../core/settings.h"
#define TAG FREERDP_TAG("common") #define TAG FREERDP_TAG("common")
struct rdp_assistance_file struct rdp_assistance_file
@ -1314,21 +1316,27 @@ BOOL freerdp_assistance_populate_settings_from_assistance_file(rdpAssistanceFile
if (!freerdp_settings_set_bool(settings, FreeRDP_RemoteAssistanceMode, TRUE)) if (!freerdp_settings_set_bool(settings, FreeRDP_RemoteAssistanceMode, TRUE))
return FALSE; return FALSE;
size_t ports = ArrayList_Count(file->MachinePorts); const size_t ports = ArrayList_Count(file->MachinePorts);
const size_t addresses = ArrayList_Count(file->MachineAddresses);
if (ports < 1) if (ports < 1)
return FALSE; return FALSE;
if (ports != addresses)
return FALSE;
const UINT32 port = (UINT32)ArrayList_GetItem(file->MachinePorts, 0); const UINT32 port = (UINT32)ArrayList_GetItem(file->MachinePorts, 0);
if (!freerdp_settings_set_uint32(settings, FreeRDP_ServerPort, port)) if (!freerdp_settings_set_uint32(settings, FreeRDP_ServerPort, port))
return FALSE; return FALSE;
if (!freerdp_settings_set_pointer_len(settings, FreeRDP_TargetNetAddresses, NULL, ports)) if (!freerdp_target_net_adresses_reset(settings, ports))
return FALSE;
if (!freerdp_settings_set_pointer_len(settings, FreeRDP_TargetNetPorts, file->MachinePorts,
ports))
return FALSE; return FALSE;
for (size_t i = 0; i < ArrayList_Count(file->MachineAddresses); i++) for (size_t x = 0; x < ports; x++)
{
const UINT32 port = (UINT32)ArrayList_GetItem(file->MachinePorts, x);
if (!freerdp_settings_set_pointer_array(settings, FreeRDP_TargetNetPorts, x, &port))
return FALSE;
}
for (size_t i = 0; i < addresses; i++)
{ {
const char* maddr = ArrayList_GetItem(file->MachineAddresses, i); const char* maddr = ArrayList_GetItem(file->MachineAddresses, i);
if (!freerdp_settings_set_pointer_array(settings, FreeRDP_TargetNetAddresses, i, maddr)) if (!freerdp_settings_set_pointer_array(settings, FreeRDP_TargetNetAddresses, i, maddr))

47
libfreerdp/common/settings.c
View File

@ -1243,9 +1243,8 @@ BOOL freerdp_settings_set_value_for_name(rdpSettings* settings, const char* name
return FALSE; return FALSE;
} }
static BOOL freerdp_settings_set_pointer_len_(rdpSettings* settings, BOOL freerdp_settings_set_pointer_len_(rdpSettings* settings, FreeRDP_Settings_Keys_Pointer id,
FreeRDP_Settings_Keys_Pointer id, SSIZE_T lenId, SSIZE_T lenId, const void* data, size_t len, size_t size)
const void* data, size_t len, size_t size)
{ {
BOOL rc = FALSE; BOOL rc = FALSE;
void* copy = NULL; void* copy = NULL;
@ -1373,11 +1372,15 @@ BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, FreeRDP_Settings_Ke
return freerdp_settings_set_pointer_len_(settings, id, FreeRDP_ServerCertificateLength, return freerdp_settings_set_pointer_len_(settings, id, FreeRDP_ServerCertificateLength,
data, len, sizeof(char)); data, len, sizeof(char));
case FreeRDP_TargetNetAddresses: case FreeRDP_TargetNetAddresses:
if (data == NULL) if ((data == NULL) && (len == 0))
{
freerdp_target_net_addresses_free(settings); freerdp_target_net_addresses_free(settings);
return freerdp_settings_set_pointer_len_(settings, FreeRDP_TargetNetAddresses, return TRUE;
FreeRDP_TargetNetAddressCount, data, len, }
sizeof(char*)); WLog_WARN(
TAG,
"[BUG] FreeRDP_TargetNetAddresses must not be resized from outside the library!");
return FALSE;
case FreeRDP_ServerLicenseProductIssuers: case FreeRDP_ServerLicenseProductIssuers:
if (data == NULL) if (data == NULL)
freerdp_server_license_issuers_free(settings); freerdp_server_license_issuers_free(settings);
@ -1385,11 +1388,14 @@ BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, FreeRDP_Settings_Ke
FreeRDP_ServerLicenseProductIssuersCount, data, FreeRDP_ServerLicenseProductIssuersCount, data,
len, sizeof(char*)); len, sizeof(char*));
case FreeRDP_TargetNetPorts: case FreeRDP_TargetNetPorts:
if (data == NULL) if ((data == NULL) && (len == 0))
{
freerdp_target_net_addresses_free(settings); freerdp_target_net_addresses_free(settings);
return freerdp_settings_set_pointer_len_(settings, FreeRDP_TargetNetPorts, return TRUE;
FreeRDP_TargetNetAddressCount, data, len, }
sizeof(UINT32)); WLog_WARN(TAG,
"[BUG] FreeRDP_TargetNetPorts must not be resized from outside the library!");
return FALSE;
case FreeRDP_DeviceArray: case FreeRDP_DeviceArray:
if (data == NULL) if (data == NULL)
freerdp_device_collection_free(settings); freerdp_device_collection_free(settings);
@ -1826,27 +1832,16 @@ ADDIN_ARGV* freerdp_dynamic_channel_clone(ADDIN_ARGV* channel)
BOOL freerdp_target_net_addresses_copy(rdpSettings* settings, char** addresses, UINT32 count) BOOL freerdp_target_net_addresses_copy(rdpSettings* settings, char** addresses, UINT32 count)
{ {
UINT32 i;
WINPR_ASSERT(settings); WINPR_ASSERT(settings);
WINPR_ASSERT(addresses); WINPR_ASSERT(addresses);
freerdp_target_net_addresses_free(settings); if (!freerdp_target_net_adresses_reset(settings, count))
settings->TargetNetAddressCount = count;
settings->TargetNetAddresses = (char**)calloc(settings->TargetNetAddressCount, sizeof(char*));
if (!settings->TargetNetAddresses)
{
freerdp_target_net_addresses_free(settings);
return FALSE; return FALSE;
}
for (i = 0; i < settings->TargetNetAddressCount; i++) for (UINT32 i = 0; i < settings->TargetNetAddressCount; i++)
{ {
settings->TargetNetAddresses[i] = _strdup(addresses[i]); if (!freerdp_settings_set_pointer_array(settings, FreeRDP_TargetNetAddresses, i,
addresses[i]))
if (!settings->TargetNetAddresses[i])
{ {
freerdp_target_net_addresses_free(settings); freerdp_target_net_addresses_free(settings);
return FALSE; return FALSE;

69
libfreerdp/core/settings.c
View File

@ -981,47 +981,20 @@ static BOOL freerdp_settings_int_buffer_copy(rdpSettings* _settings, const rdpSe
RedirectionTsvUrlLength)) RedirectionTsvUrlLength))
goto out_fail; goto out_fail;
freerdp_settings_set_uint32( const UINT32 nrports = freerdp_settings_get_uint32(settings, FreeRDP_TargetNetAddressCount);
_settings, FreeRDP_TargetNetAddressCount, if (!freerdp_target_net_adresses_reset(_settings, nrports))
freerdp_settings_get_uint32(settings, FreeRDP_TargetNetAddressCount)); return FALSE;
if (freerdp_settings_get_uint32(settings, FreeRDP_TargetNetAddressCount) > 0) for (UINT32 i = 0; i < nrports; i++)
{ {
_settings->TargetNetAddresses = (char**)calloc( const char* address =
freerdp_settings_get_uint32(settings, FreeRDP_TargetNetAddressCount), sizeof(char*)); freerdp_settings_get_pointer_array(settings, FreeRDP_TargetNetAddresses, i);
const UINT32* port =
if (!_settings->TargetNetAddresses) freerdp_settings_get_pointer_array(settings, FreeRDP_TargetNetPorts, i);
{ if (!freerdp_settings_set_pointer_array(_settings, FreeRDP_TargetNetAddresses, i, address))
freerdp_settings_set_uint32(_settings, FreeRDP_TargetNetAddressCount, 0); return FALSE;
goto out_fail; if (!freerdp_settings_set_pointer_array(_settings, FreeRDP_TargetNetPorts, i, port))
} return FALSE;
for (index = 0;
index < freerdp_settings_get_uint32(settings, FreeRDP_TargetNetAddressCount); index++)
{
_settings->TargetNetAddresses[index] = _strdup(settings->TargetNetAddresses[index]);
if (!_settings->TargetNetAddresses[index])
{
while (index)
free(_settings->TargetNetAddresses[--index]);
free(_settings->TargetNetAddresses);
_settings->TargetNetAddresses = NULL;
freerdp_settings_set_uint32(_settings, FreeRDP_TargetNetAddressCount, 0);
goto out_fail;
}
}
const void* ports = freerdp_settings_get_pointer(settings, FreeRDP_TargetNetPorts);
if (ports)
{
const UINT32 nrports =
freerdp_settings_get_uint32(settings, FreeRDP_TargetNetAddressCount);
if (!freerdp_settings_set_pointer_len(_settings, FreeRDP_TargetNetPorts, ports,
nrports))
goto out_fail;
}
} }
{ {
@ -1123,6 +1096,7 @@ BOOL freerdp_settings_copy(rdpSettings* _settings, const rdpSettings* settings)
_settings->RedirectionPassword = NULL; _settings->RedirectionPassword = NULL;
_settings->RedirectionTsvUrl = NULL; _settings->RedirectionTsvUrl = NULL;
_settings->TargetNetAddresses = NULL; _settings->TargetNetAddresses = NULL;
_settings->TargetNetPorts = NULL;
_settings->DeviceArray = NULL; _settings->DeviceArray = NULL;
_settings->StaticChannelArray = NULL; _settings->StaticChannelArray = NULL;
_settings->DynamicChannelArray = NULL; _settings->DynamicChannelArray = NULL;
@ -1269,3 +1243,20 @@ const char* freerdp_settings_glyph_level_string(UINT32 level, char* buffer, size
_snprintf(buffer, size, "%s[0x%08" PRIx32 "]", str, level); _snprintf(buffer, size, "%s[0x%08" PRIx32 "]", str, level);
return buffer; return buffer;
} }
BOOL freerdp_target_net_adresses_reset(rdpSettings* settings, size_t size)
{
freerdp_target_net_addresses_free(settings);
if (size > 0)
{
if (!freerdp_settings_set_pointer_len_(settings, FreeRDP_TargetNetPorts, -1, NULL, size,
sizeof(UINT32)))
return FALSE;
if (!freerdp_settings_set_pointer_len_(settings, FreeRDP_TargetNetAddresses,
FreeRDP_TargetNetAddressCount, NULL, size,
sizeof(char*)))
return FALSE;
}
return TRUE;
}

6
libfreerdp/core/settings.h
View File

@ -66,4 +66,10 @@ FREERDP_LOCAL BOOL identity_set_from_smartcard_hash(SEC_WINNT_AUTH_IDENTITY_W* i
FREERDP_LOCAL const char* freerdp_settings_glyph_level_string(UINT32 level, char* buffer, FREERDP_LOCAL const char* freerdp_settings_glyph_level_string(UINT32 level, char* buffer,
size_t size); size_t size);
FREERDP_LOCAL BOOL freerdp_settings_set_pointer_len_(rdpSettings* settings,
FreeRDP_Settings_Keys_Pointer id,
SSIZE_T lenId, const void* data, size_t len,
size_t size);
FREERDP_LOCAL BOOL freerdp_target_net_adresses_reset(rdpSettings* settings, size_t size);
#endif /* FREERDP_LIB_CORE_SETTINGS_H */ #endif /* FREERDP_LIB_CORE_SETTINGS_H */