colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: use nm_strndup_a instead of strndupa

Browse Source 
Alpine doesn't have strndupa.

Fixes: 38d1bcee3b ('ip: configurable address pool and lease time of DHCP server in shared mode')
This commit is contained in:
Íñigo Huguet
2024-12-20 20:25:14 +01:00
parent a1b44d1958
commit fdf1a9fb1e
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/libnm-core-aux-intern/nm-libnm-core-utils.c
View File

@@ -483,20 +483,21 @@ nm_utils_validate_shared_dhcp_range(const char *shared_dhcp_range,
GPtrArray *addresses, GPtrArray *addresses,
GError **error) GError **error)
{ {
char *start_address_str; char *start_address_str;
char *end_address_str; char *end_address_str;
NMIPAddress *interface_address_with_prefix; NMIPAddress *interface_address_with_prefix;
NMIPAddr interface_address; NMIPAddr interface_address;
NMIPAddr start_address; NMIPAddr start_address;
NMIPAddr end_address; NMIPAddr end_address;
guint32 i; guint32 i;
guint32 mask; guint32 mask;
guint32 prefix_length; guint32 prefix_length;
guint32 start_network; guint32 start_network;
guint32 end_network; guint32 end_network;
guint32 interface_network; guint32 interface_network;
guint32 start_ip_length; guint32 start_ip_length;
bool range_is_in_interface_network; bool range_is_in_interface_network;
gs_free char *to_free = NULL;
g_return_val_if_fail(!error || !(*error), FALSE); g_return_val_if_fail(!error || !(*error), FALSE);
@@ -538,7 +539,7 @@ nm_utils_validate_shared_dhcp_range(const char *shared_dhcp_range,
return FALSE; return FALSE;
} }
start_address_str = strndupa(shared_dhcp_range, start_ip_length); start_address_str = nm_strndup_a(200, shared_dhcp_range, start_ip_length, &to_free);
++end_address_str; /* end address is pointing to ',', shift it to the actual address */ ++end_address_str; /* end address is pointing to ',', shift it to the actual address */
if (!nm_inet_parse_bin(AF_INET, start_address_str, NULL, &start_address)) { if (!nm_inet_parse_bin(AF_INET, start_address_str, NULL, &start_address)) {