fixup! dns: use dns-priority to provide a preprocessed domain list to plugins

First construct the @domains strv array, and then assign it.
Don't assign the half-initialized array early on, but do it
at the end.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c
index 669371378d..e5dac09400 100644
--- a/src/dns/nm-dns-manager.c
+++ b/src/dns/nm-dns-manager.c
@@ -1252,11 +1252,9 @@ rebuild_domain_lists (NMDnsManager *self)
 
 		priority = nm_ip_config_get_dns_priority (ip_config);
 		nm_assert (priority != 0);
-		g_free (ip_data->domains.search);
 		domains = g_new0 (const char *,
 		                  2 + NM_MAX (nm_ip_config_get_num_searches (ip_config),
 		                              nm_ip_config_get_num_domains (ip_config)));
-		ip_data->domains.search = domains;
 
 		/* Add wildcard lookup domain to connections with the default route.
 		 * If there is no default route, add the wildcard domain to all non-VPN
@@ -1312,6 +1310,9 @@ rebuild_domain_lists (NMDnsManager *self)
 		}
 		domains[n] = NULL;
 
+		g_free (ip_data->domains.search);
+		ip_data->domains.search = domains;
+
 		g_strfreev (ip_data->domains.reverse);
 		ip_data->domains.reverse = get_ip_rdns_domains (ip_config);
 	}