From f4db6f13cbcd6cea3e83aed36333dcb9f5f741db Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 24 Jun 2014 10:47:30 +0200 Subject: [PATCH] core: fix assertion logging master device during activation backtrace: #0 0x0000003370c504e9 in g_logv (log_domain=0x4c14cc "NetworkManager", log_level=G_LOG_LEVEL_CRITICAL, format=, args=args@entry=0x7fff420d05c0) at gmessages.c:989 #1 0x0000003370c5063f in g_log (log_domain=log_domain@entry=0x4c14cc "NetworkManager", log_level=log_level@entry=G_LOG_LEVEL_CRITICAL, format=format@entry=0x3370cbc89a "%s: assertion '%s' failed") at gmessages.c:1025 #2 0x0000003370c50679 in g_return_if_fail_warning (log_domain=log_domain@entry=0x4c14cc "NetworkManager", pretty_function=pretty_function@entry=0x4b4710 <__PRETTY_FUNCTION__.35285> "nm_device_get_iface", expression=expression@entry=0x4b160a "self != NULL") at gmessages.c:1034 #3 0x000000000042e39b in nm_device_get_iface (self=0x0) at devices/nm-device.c:501 #4 0x00000000004393cc in nm_device_activate_stage3_ip_config_start (user_data=) at devices/nm-device.c:4062 #5 0x0000003370c492a6 in g_main_dispatch (context=0x153b190) at gmain.c:3066 #6 g_main_context_dispatch (context=context@entry=0x153b190) at gmain.c:3642 #7 0x0000003370c49628 in g_main_context_iterate (context=0x153b190, block=block@entry=1, dispatch=dispatch@entry=1, self=) at gmain.c:3713 #8 0x0000003370c49a3a in g_main_loop_run (loop=0x153ae30) at gmain.c:3907 #9 0x0000000000429f15 in main (argc=1, argv=0x7fff420d0b78) at main.c:678 Signed-off-by: Thomas Haller --- src/devices/nm-device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 9e73005788..84c714a102 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -4062,7 +4062,7 @@ nm_device_activate_stage3_ip_config_start (gpointer user_data) nm_log_info (LOGD_DEVICE, "Activation (%s) connection '%s' waiting on master '%s'", nm_device_get_iface (self), nm_connection_get_id (nm_device_get_connection (self)), - nm_device_get_iface (master_device)); + master_device ? nm_device_get_iface (master_device) : "(unknown)"); } goto out; }