summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2010-04-25 00:09:43 -0700
committerDan Williams <dcbw@redhat.com>2010-04-27 03:32:39 -0700
commitd1b3a1df300324f7dfe6fcb0029e370cd54b15b5 (patch)
tree17e118a37db6dec2890d7e0fcfc6d891a1b31563
parentc3d135ec568dff7f79f1705951c2fe5fce6c6f6f (diff)
downloadnetwork-manager-applet-d1b3a1df300324f7dfe6fcb0029e370cd54b15b5.tar.gz
core: be more resilient to D-Bus method call errors (rh #582938)
-rw-r--r--src/applet.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/applet.c b/src/applet.c
index e174ede4..19c43902 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -1689,9 +1689,14 @@ applet_get_exported_connection_for_device (NMDevice *device, NMApplet *applet)
const GPtrArray *devices;
active = g_ptr_array_index (active_connections, i);
+ if (!active)
+ continue;
+
devices = nm_active_connection_get_devices (active);
service_name = nm_active_connection_get_service_name (active);
connection_path = nm_active_connection_get_connection (active);
+ if (!devices || !service_name || !connection_path)
+ continue;
if (strcmp (service_name, NM_DBUS_SERVICE_USER_SETTINGS) != 0)
continue;