about summary refs log tree commit diff
path: root/src/nm-core-utils.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2018-02-07 02:40:03 +0100
committerMichael Biebl <biebl@debian.org>2018-02-07 02:40:03 +0100
commit77dfac263f463c1cdb8afb9b8c79a4e83bf08cd8 (patch)
treee5288440b22e159a601450c2e5d40b013bdb4aa0 /src/nm-core-utils.c
parent3d9525cb641ac53c6d36bf5312710c22ae4bd926 (diff)
parent50f6b47074e01dffb8dc536c0a20961dcf28ae9b (diff)
Update upstream source from tag 'upstream/1.10.4'
Update to upstream version '1.10.4'
with Debian dir d2c0f877c591b3125f4e0cfcc711c04669d8d62b
Diffstat (limited to 'src/nm-core-utils.c')
-rw-r--r--src/nm-core-utils.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index 40a0c352..f6b33a14 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -1960,8 +1960,7 @@ nm_utils_resolve_conf_parse (int addr_family,
 				gsize i_tokens;
 
 				tokens = nm_utils_strsplit_set (s, " \t");
-				nm_assert (tokens);
-				for (i_tokens = 0; tokens[i_tokens]; i_tokens++) {
+				for (i_tokens = 0; tokens && tokens[i_tokens]; i_tokens++) {
 					gs_free char *t = g_strstrip (g_strdup (tokens[i_tokens]));
 
 					if (   _nm_utils_dns_option_validate (t, NULL, NULL,