fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-19 19:20:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp: require options argument for nm_dhcp_option_add_option()

Browse source 
It's not clear why the option argument would be optional.
Also, it's not optional for nm_dhcp_option_take_option().

Add an nm_assert() to catch such wrong uses.
This commit is contained in:
Thomas Haller 2021-02-10 09:26:41 +01:00
parent 1e15ea9dd5
commit f0a9268718
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/core/dhcp/nm-dhcp-options.c
View file

@ -219,7 +219,12 @@ nm_dhcp_option_take_option(GHashTable * options,
guint option,
char * value)
{
nm_assert(options);
if (!options) {
nm_assert_not_reached();
g_free(value);
return;
}
nm_assert(requests);
nm_assert(value);
nm_assert(g_utf8_validate(value, -1, NULL));
@ -233,8 +238,7 @@ nm_dhcp_option_add_option(GHashTable * options,
guint option,
const char * value)
{
if (options)
nm_dhcp_option_take_option(options, requests, option, g_strdup(value));
nm_dhcp_option_take_option(options, requests, option, g_strdup(value));
}
void
@ -243,11 +247,10 @@ nm_dhcp_option_add_option_u64(GHashTable * options,
guint option,
guint64 value)
{
if (options)
nm_dhcp_option_take_option(options,
requests,
option,
g_strdup_printf("%" G_GUINT64_FORMAT, value));
nm_dhcp_option_take_option(options,
requests,
option,
g_strdup_printf("%" G_GUINT64_FORMAT, value));
}
void
@ -255,8 +258,10 @@ nm_dhcp_option_add_requests_to_options(GHashTable *options, const NMDhcpOption *
{
guint i;
if (!options)
if (!options) {
nm_assert_not_reached();
return;
}
for (i = 0; requests[i].name; i++) {
if (requests[i].include)