applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network: Fix crash when changing IPv4 DNS

Browse source 
The dns_servers GStrv was not NULL-terminated because we forgot to
append a NULL item to the GPtrArray that we used to construct it.

https://bugzilla.gnome.org/show_bug.cgi?id=771251
This commit is contained in:
Bastien Nocera 2016-09-13 11:45:20 +02:00
parent 6168126a03
commit ca47ff295a
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
panels/network/connection-editor/ce-page-ip4.c
View file

@ -787,6 +787,13 @@ ui_to_setting (CEPageIP4 *page)
} }
g_list_free (children); g_list_free (children);
if (dns_servers->len == 0) {
g_ptr_array_free (dns_servers, TRUE);
dns_servers = NULL;
} else {
g_ptr_array_add (dns_servers, NULL);
}
routes = g_ptr_array_new_with_free_func (g_object_unref); routes = g_ptr_array_new_with_free_func (g_object_unref);
if (g_str_equal (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO) || if (g_str_equal (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO) ||
g_str_equal (method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL)) g_str_equal (method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL))
@ -878,7 +885,7 @@ ui_to_setting (CEPageIP4 *page)
g_object_set (page->setting, g_object_set (page->setting,
NM_SETTING_IP_CONFIG_METHOD, method, NM_SETTING_IP_CONFIG_METHOD, method,
NM_SETTING_IP_CONFIG_ADDRESSES, addresses, NM_SETTING_IP_CONFIG_ADDRESSES, addresses,
NM_SETTING_IP_CONFIG_DNS, dns_servers->pdata, NM_SETTING_IP_CONFIG_DNS, dns_servers ? dns_servers->pdata : NULL,
NM_SETTING_IP_CONFIG_ROUTES, routes, NM_SETTING_IP_CONFIG_ROUTES, routes,
NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, ignore_auto_dns, NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, ignore_auto_dns,
NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, ignore_auto_routes, NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, ignore_auto_routes,