From d1f65c6c4f9dd9750f9ad3eda5b590a4ffca6498 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sun, 16 Mar 2003 21:01:57 +0000 Subject: 2003-03-16 Havoc Pennington * dbus/dbus-bus.c (ensure_bus_data): handle failure to set connection data * dbus/dbus-memory.c (_dbus_initialize_malloc_debug): support DBUS_MALLOC_BACKTRACES to print trace when failing an alloc --- dbus/dbus-bus.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'dbus/dbus-bus.c') diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c index 84434888..8f7fb90e 100644 --- a/dbus/dbus-bus.c +++ b/dbus/dbus-bus.c @@ -146,8 +146,13 @@ ensure_bus_data (DBusConnection *connection) return NULL; } - dbus_connection_set_data (connection, bus_data_slot, bd, - bus_data_free); + if (!dbus_connection_set_data (connection, bus_data_slot, bd, + bus_data_free)) + { + bus_data_free (bd); + data_slot_unref (); + return NULL; + } /* Data slot refcount now held by the BusData */ } -- cgit