From 4cc2bfa10e1a840e0da34a588f719779cc284a79 Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Tue, 15 Jan 2008 15:49:35 -0500 Subject: check failed allocation (FDO Bug #12920) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2008-01-15 John (J5) Palmieri * patch by Kimmo Hämäläinen * bus/bus.c (setup_server): check failed allocation (FDO Bug #12920) --- ChangeLog | 6 ++++++ bus/bus.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dfa00b17..45471768 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-01-15 John (J5) Palmieri + + * patch by Kimmo Hämäläinen + + * bus/bus.c (setup_server): check failed allocation (FDO Bug #12920) + 2008-01-15 John (J5) Palmieri * patch by Kimmo Hämäläinen diff --git a/bus/bus.c b/bus/bus.c index 864e48ba..a28a2672 100644 --- a/bus/bus.c +++ b/bus/bus.c @@ -208,9 +208,9 @@ setup_server (BusContext *context, BusServerData *bd; bd = dbus_new0 (BusServerData, 1); - if (!dbus_server_set_data (server, - server_data_slot, - bd, free_server_data)) + if (bd == NULL || !dbus_server_set_data (server, + server_data_slot, + bd, free_server_data)) { dbus_free (bd); BUS_SET_OOM (error); -- cgit