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

libnm-core: allow G_TYPE_STRV to be NULL

Browse Source 
Otherwise we assert in _nm_utils_strv_to_slist() when setting a property,
using the code like:
g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (param_spec));
g_param_value_set_default (param_spec, &value);
g_object_set_property (G_OBJECT (setting), prop, &value);

e.g:
nmcli con mod my_profile eth.mac-address-blacklist "02:14:20:e6:16:83"

(changed by commit 6a4127cfa0)
This commit is contained in:
Jiří Klimeš
2014-09-09 18:06:11 +02:00
parent 8657b4229c
commit 053c8fa5df
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libnm-core/nm-utils.c
View File

@@ -681,9 +681,7 @@ _nm_utils_strv_to_slist (char **strv)
int i; int i;
GSList *list = NULL; GSList *list = NULL;
g_return_val_if_fail (strv != NULL, NULL); for (i = 0; strv && strv[i]; i++)
for (i = 0; strv[i]; i++)
list = g_slist_prepend (list, g_strdup (strv[i])); list = g_slist_prepend (list, g_strdup (strv[i]));
return g_slist_reverse (list); return g_slist_reverse (list);
@@ -696,6 +694,9 @@ _nm_utils_slist_to_strv (GSList *slist)
char **strv; char **strv;
int len, i = 0; int len, i = 0;
if (slist == NULL)
return NULL;
len = g_slist_length (slist); len = g_slist_length (slist);
strv = g_new (char *, len + 1); strv = g_new (char *, len + 1);