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

cli: first validate all values in _set_fcn_multilist() before modifying the setting

Browse Source
This commit is contained in:
Thomas Haller
2019-03-19 12:06:47 +01:00
parent b63620e67c
commit 0cb1c20f93
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
clients/common/nm-meta-setting-desc.c
View File

@@ -1667,13 +1667,15 @@ static gboolean
_set_fcn_multilist (ARGS_SET_FCN) _set_fcn_multilist (ARGS_SET_FCN)
{ {
gs_free const char **strv = NULL; gs_free const char **strv = NULL;
gsize i; gsize i, j;
if (_SET_FCN_DO_RESET_DEFAULT (value)) if (_SET_FCN_DO_RESET_DEFAULT (value))
return _gobject_property_reset_default (setting, property_info->property_name); return _gobject_property_reset_default (setting, property_info->property_name);
strv = nm_utils_strsplit_set (value, " \t,", FALSE); strv = nm_utils_strsplit_set (value, " \t,", FALSE);
if (strv) { if (strv) {
j = 0;
for (i = 0; strv[i]; i++) { for (i = 0; strv[i]; i++) {
const char *item = strv[i]; const char *item = strv[i];
@@ -1687,8 +1689,12 @@ _set_fcn_multilist (ARGS_SET_FCN)
if (!item) if (!item)
return FALSE; return FALSE;
property_info->property_typ_data->subtype.multilist.add_fcn (setting, item); strv[j++] = item;
} }
strv[j] = NULL;
for (i = 0; strv[i]; i++)
property_info->property_typ_data->subtype.multilist.add_fcn (setting, strv[i]);
} }
return TRUE; return TRUE;
} }