From 31539034b306ea2b324ffb85f776b6a5e0b38acf Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 23 Mar 2009 14:38:33 -0400 Subject: [PATCH] core: fix segfault when device's IP4Config object isn't ready (rh #491620) --- src/nm-device.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/nm-device.c b/src/nm-device.c index bb24b8b8af..1eeb45dde7 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -2262,10 +2262,13 @@ get_property (GObject *object, guint prop_id, g_value_set_uint (value, priv->ip4_address); break; case NM_DEVICE_INTERFACE_PROP_IP4_CONFIG: - if ((state == NM_DEVICE_STATE_ACTIVATED) || (state == NM_DEVICE_STATE_IP_CONFIG)) - g_value_set_boxed (value, nm_ip4_config_get_dbus_path (priv->ip4_config)); - else - g_value_set_boxed (value, "/"); + if ((state == NM_DEVICE_STATE_ACTIVATED) || (state == NM_DEVICE_STATE_IP_CONFIG)) { + if (priv->ip4_config) { + g_value_set_boxed (value, nm_ip4_config_get_dbus_path (priv->ip4_config)); + break; + } + } + g_value_set_boxed (value, "/"); break; case NM_DEVICE_INTERFACE_PROP_DHCP4_CONFIG: if ( ((state == NM_DEVICE_STATE_ACTIVATED) || (state == NM_DEVICE_STATE_IP_CONFIG))