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

libnm: don't use g_strsplit_set() to search string for invalid characters

Browse Source
This commit is contained in:
Thomas Haller
2017-12-08 10:09:01 +01:00
parent 79d5a06c8b
commit 6c93e32212
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libnm-core/nm-setting-team.c
View File

@@ -168,7 +168,6 @@ nm_team_link_watcher_new_nsna_ping (gint init_wait,
GError **error) GError **error)
{ {
NMTeamLinkWatcher *watcher; NMTeamLinkWatcher *watcher;
gs_strfreev gchar **strv = NULL;
const char *val_fail = NULL; const char *val_fail = NULL;
if (!target_host) { if (!target_host) {
@@ -177,8 +176,7 @@ nm_team_link_watcher_new_nsna_ping (gint init_wait,
return NULL; return NULL;
} }
strv = g_strsplit_set (target_host, " \\/\t=\"\'", 0); if (strpbrk (target_host, " \\/\t=\"\'")) {
if (strv[1]) {
g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED, g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
_("target-host '%s' contains invalid characters"), target_host); _("target-host '%s' contains invalid characters"), target_host);
return NULL; return NULL;
@@ -236,7 +234,6 @@ nm_team_link_watcher_new_arp_ping (gint init_wait,
GError **error) GError **error)
{ {
NMTeamLinkWatcher *watcher; NMTeamLinkWatcher *watcher;
gs_strfreev gchar **strv = NULL;
const char *val_fail = NULL; const char *val_fail = NULL;
if (!target_host || !source_host) { if (!target_host || !source_host) {
@@ -246,16 +243,13 @@ nm_team_link_watcher_new_arp_ping (gint init_wait,
return NULL; return NULL;
} }
strv = g_strsplit_set (target_host, " \\/\t=\"\'", 0); if (strpbrk (target_host, " \\/\t=\"\'")) {
if (strv[1]) {
g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED, g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
_("target-host '%s' contains invalid characters"), target_host); _("target-host '%s' contains invalid characters"), target_host);
return NULL; return NULL;
} }
g_strfreev (strv);
strv = g_strsplit_set (source_host, " \\/\t=\"\'", 0); if (strpbrk (target_host, " \\/\t=\"\'")) {
if (strv[1]) {
g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED, g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
_("source-host '%s' contains invalid characters"), source_host); _("source-host '%s' contains invalid characters"), source_host);
return NULL; return NULL;