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

libnm: assert that dbus_connection_allocate_data_slot() doesn't fail

Browse Source 
dbus_connection_allocate_data_slot() can only fail on ENOMEM, in which
case the immediately-following call to g_set_error() would also get
ENOMEM and abort. So just simplify and assert that the libdbus call
didn't fail.
This commit is contained in:
Dan Winship
2014-09-05 13:24:16 -04:00
parent c6a932a2ce
commit a874e0beac
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libnm/nm-dbus-helpers.c
View File

@@ -28,17 +28,16 @@
static dbus_int32_t priv_slot = -1; static dbus_int32_t priv_slot = -1;
static gboolean static void
_ensure_dbus_data_slot (void) _ensure_dbus_data_slot (void)
{ {
static gsize init_value = 0; static gsize init_value = 0;
gboolean success = TRUE;
if (g_once_init_enter (&init_value)) { if (g_once_init_enter (&init_value)) {
success = dbus_connection_allocate_data_slot (&priv_slot); dbus_connection_allocate_data_slot (&priv_slot);
g_assert (priv_slot != -1);
g_once_init_leave (&init_value, 1); g_once_init_leave (&init_value, 1);
} }
return success;
} }
DBusGConnection * DBusGConnection *
@@ -46,10 +45,7 @@ _nm_dbus_new_connection (GError **error)
{ {
DBusGConnection *connection = NULL; DBusGConnection *connection = NULL;
if (!_ensure_dbus_data_slot ()) { _ensure_dbus_data_slot ();
g_set_error (error, DBUS_GERROR, DBUS_GERROR_FAILED, "failed to allocated data slot");
return NULL;
}
#if HAVE_DBUS_GLIB_100 #if HAVE_DBUS_GLIB_100
/* If running as root try the private bus first */ /* If running as root try the private bus first */
@@ -77,7 +73,7 @@ _nm_dbus_new_connection (GError **error)
gboolean gboolean
_nm_dbus_is_connection_private (DBusGConnection *connection) _nm_dbus_is_connection_private (DBusGConnection *connection)
{ {
if (!_ensure_dbus_data_slot ()) if (priv_slot == -1)
return FALSE; return FALSE;
return !!dbus_connection_get_data (dbus_g_connection_get_connection (connection), priv_slot); return !!dbus_connection_get_data (dbus_g_connection_get_connection (connection), priv_slot);
} }