fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 08:48:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
(cherry picked from commit 6c93e32212)
This commit is contained in:
Thomas Haller 2017-12-08 10:09:01 +01:00 • committed by Francesco Giudici
parent 1268038b4a
commit 3b68867123
1 changed files with 3 additions and 9 deletions
Show stats 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)
{
NMTeamLinkWatcher *watcher;
gs_strfreev gchar **strv = NULL;
const char *val_fail = NULL;
if (!target_host) {
@ -177,8 +176,7 @@ nm_team_link_watcher_new_nsna_ping (gint init_wait,
return NULL;
}
strv = g_strsplit_set (target_host, " \\/\t=\"\'", 0);
if (strv[1]) {
if (strpbrk (target_host, " \\/\t=\"\'")) {
g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
_("target-host '%s' contains invalid characters"), target_host);
return NULL;
@ -236,7 +234,6 @@ nm_team_link_watcher_new_arp_ping (gint init_wait,
GError **error)
{
NMTeamLinkWatcher *watcher;
gs_strfreev gchar **strv = NULL;
const char *val_fail = NULL;
if (!target_host || !source_host) {
@ -246,16 +243,13 @@ nm_team_link_watcher_new_arp_ping (gint init_wait,
return NULL;
}
strv = g_strsplit_set (target_host, " \\/\t=\"\'", 0);
if (strv[1]) {
if (strpbrk (target_host, " \\/\t=\"\'")) {
g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
_("target-host '%s' contains invalid characters"), target_host);
return NULL;
}
g_strfreev (strv);
strv = g_strsplit_set (source_host, " \\/\t=\"\'", 0);
if (strv[1]) {
if (strpbrk (target_host, " \\/\t=\"\'")) {
g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
_("source-host '%s' contains invalid characters"), source_host);
return NULL;