diff options
| author | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
| commit | 34b1c46437df982495d08a8bbb8bd0b262d8af48 (patch) | |
| tree | 1db29ec39d9f733922b3a33cabcc8e6486fa06aa /clients/common | |
| parent | 50fc50153b0036516b853aa576dc435bd53ce736 (diff) | |
| parent | 50a58f0fabd8a34c1b6108a107e08abe3c1ccd24 (diff) | |
Merge tag 'upstream/1.0.4'
Upstream version 1.0.4
Diffstat (limited to 'clients/common')
| -rw-r--r-- | clients/common/nm-secret-agent-simple.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c index 80022a4d..8eddb440 100644 --- a/clients/common/nm-secret-agent-simple.c +++ b/clients/common/nm-secret-agent-simple.c @@ -122,10 +122,10 @@ static gboolean strv_has (gchar **haystack, gchar *needle) { - gchar *iter; + gchar **iter; - for (iter = *haystack; iter; iter++) { - if (g_strcmp0 (iter, needle) == 0) + for (iter = haystack; iter && *iter; iter++) { + if (g_strcmp0 (*iter, needle) == 0) return TRUE; } |