diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 9d5f6ae954..8b7973890e 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -3227,12 +3227,14 @@ ip4_config_merge_and_apply (NMDevice *self, if (connection) { NMSettingIPConfig *s_ip4 = nm_connection_get_setting_ip4_config (connection); - if (nm_setting_ip_config_get_ignore_auto_routes (s_ip4)) - nm_ip4_config_reset_routes (composite); - if (nm_setting_ip_config_get_ignore_auto_dns (s_ip4)) - nm_ip4_config_reset_nameservers (composite); - nm_ip4_config_reset_domains (composite); - nm_ip4_config_reset_searches (composite); + if (s_ip4) { + if (nm_setting_ip_config_get_ignore_auto_routes (s_ip4)) + nm_ip4_config_reset_routes (composite); + if (nm_setting_ip_config_get_ignore_auto_dns (s_ip4)) + nm_ip4_config_reset_nameservers (composite); + nm_ip4_config_reset_domains (composite); + nm_ip4_config_reset_searches (composite); + } } /* Merge user overrides into the composite config. For assumed connections, @@ -3835,12 +3837,14 @@ ip6_config_merge_and_apply (NMDevice *self, if (connection) { NMSettingIPConfig *s_ip6 = nm_connection_get_setting_ip6_config (connection); - if (nm_setting_ip_config_get_ignore_auto_routes (s_ip6)) - nm_ip6_config_reset_routes (composite); - if (nm_setting_ip_config_get_ignore_auto_dns (s_ip6)) - nm_ip6_config_reset_nameservers (composite); - nm_ip6_config_reset_domains (composite); - nm_ip6_config_reset_searches (composite); + if (s_ip6) { + if (nm_setting_ip_config_get_ignore_auto_routes (s_ip6)) + nm_ip6_config_reset_routes (composite); + if (nm_setting_ip_config_get_ignore_auto_dns (s_ip6)) + nm_ip6_config_reset_nameservers (composite); + nm_ip6_config_reset_domains (composite); + nm_ip6_config_reset_searches (composite); + } } /* Merge user overrides into the composite config. For assumed connections,