summaryrefslogtreecommitdiff
path: root/src/nm-dbus-manager.c
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2009-04-01 07:17:17 -0400
committerDan Williams <dcbw@redhat.com>2009-04-01 07:20:16 -0400
commit67ffcfab11e60f00dd76ec1e7c24cee025fcb58b (patch)
treea0ae2abd1f70a6be7c801164d4cd5f968e167e94 /src/nm-dbus-manager.c
parenta240e6549bc2f39b68a5e1fd0c20546ba9106ced (diff)
downloadNetworkManager-67ffcfab11e60f00dd76ec1e7c24cee025fcb58b.tar.gz
core: fix crash when NameHasOwner fails but dbus-glib doesn't set an error (lp #352400)
Diffstat (limited to 'src/nm-dbus-manager.c')
-rw-r--r--src/nm-dbus-manager.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c
index a35a715ad3..b05c4421ae 100644
--- a/src/nm-dbus-manager.c
+++ b/src/nm-dbus-manager.c
@@ -221,8 +221,9 @@ nm_dbus_manager_name_has_owner (NMDBusManager *self,
G_TYPE_INVALID,
G_TYPE_BOOLEAN, &has_owner,
G_TYPE_INVALID)) {
- nm_warning ("Error on NameHasOwner DBUS call: %s", err->message);
- g_error_free (err);
+ nm_warning ("NameHasOwner request failed: %s",
+ (err && err->message) ? err->message : "(unknown)");
+ g_clear_error (&err);
}
return has_owner;