colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

device: check nm_ip6_config_get_address_first_nontentative() argument

Browse Source 
Since commit 9ff161b2a1 ("device: move have_ip6_address() to
nm_ip6_config_get_address_first_nontentative()") the IP configuration
argument of nm_ip6_config_get_address_first_nontentative() must be
non-NULL. Add checks where needed.

Fixes: 9ff161b2a1
This commit is contained in:
Beniamino Galvani
2016-02-03 09:05:25 +01:00
parent 05b34e11d6
commit b5a469a894
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/devices/nm-device.c
View File

@@ -5538,7 +5538,8 @@ linklocal6_start (NMDevice *self)
linklocal6_cleanup (self); linklocal6_cleanup (self);
if (nm_ip6_config_get_address_first_nontentative (priv->ip6_config, TRUE)) if ( priv->ip6_config
&& nm_ip6_config_get_address_first_nontentative (priv->ip6_config, TRUE))
return NM_ACT_STAGE_RETURN_FINISH; return NM_ACT_STAGE_RETURN_FINISH;
connection = nm_device_get_applied_connection (self); connection = nm_device_get_applied_connection (self);
@@ -5773,7 +5774,8 @@ rdisc_ra_timeout (NMRDisc *rdisc, NMDevice *self)
* IPv6 configuration, like manual IPv6 addresses or external IPv6 * IPv6 configuration, like manual IPv6 addresses or external IPv6
* config, consider that sufficient for IPv6 success. * config, consider that sufficient for IPv6 success.
*/ */
if (nm_ip6_config_get_address_first_nontentative (priv->ip6_config, FALSE)) if ( priv->ip6_config
&& nm_ip6_config_get_address_first_nontentative (priv->ip6_config, FALSE))
nm_device_activate_schedule_ip6_config_result (self); nm_device_activate_schedule_ip6_config_result (self);
else else
nm_device_activate_schedule_ip6_config_timeout (self); nm_device_activate_schedule_ip6_config_timeout (self);