trivial: check for NULL setting in nm_ip6_config_merge_setting()

This commit is contained in:
Pavel Šimerda 2013-07-12 18:34:31 +02:00
parent 7c0657a119
commit 317bd6bf6c

View file

@ -230,6 +230,9 @@ nm_ip6_config_merge_setting (NMIP6Config *config, NMSettingIP6Config *setting)
guint naddresses, nroutes, nnameservers, nsearches;
int i;
if (!setting)
return;
naddresses = nm_setting_ip6_config_get_num_addresses (setting);
nroutes = nm_setting_ip6_config_get_num_routes (setting);
nnameservers = nm_setting_ip6_config_get_num_dns (setting);