From ca61fe81fff06f18edf158d0b69b7fa994274109 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 20 Nov 2020 22:50:24 +0100 Subject: [PATCH] dns: fix accessing NULL domains.reverse array in rebuild_domain_lists() Fixes: fbf1683c1a75 ('dns: more debug logging for DNS settings in rebuild_domain_lists()') (cherry picked from commit 937c8a466928600390d221da233b6b3eed82c3a6) (cherry picked from commit b6a9242b1ad218fe6422d517c9913d4ca0bb2c45) --- src/dns/nm-dns-manager.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c index 9379621c41..f490dc835c 100644 --- a/src/dns/nm-dns-manager.c +++ b/src/dns/nm-dns-manager.c @@ -1542,7 +1542,9 @@ rebuild_domain_lists (NMDnsManager *self) ? " (explicit)" : (ip_data->domains.has_default_route_exclusive ? " (exclusive)" : ""), (str1 = g_strjoinv (",", (char **) ip_data->domains.search)), - (str2 = g_strjoinv (",", ip_data->domains.reverse))); + ( ip_data->domains.reverse + ? (str2 = g_strjoinv (",", ip_data->domains.reverse)) + : "")); } } }