check failed allocation (FDO Bug #12920)

2008-01-15  John (J5) Palmieri  <johnp@redhat.com>

	* patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>

	* bus/bus.c (setup_server): check failed allocation (FDO Bug #12920)

diff --git a/ChangeLog b/ChangeLog
index dfa00b17869f76abbbb597e018c97a038c6aeb9c..454717681c0989e3dc73f36c7a8eb86697dd24e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-15  John (J5) Palmieri  <johnp@redhat.com>
+       
+       * patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>
+
+       * bus/bus.c (setup_server): check failed allocation (FDO Bug #12920)
+       
 2008-01-15  John (J5) Palmieri  <johnp@redhat.com>
        
        * patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>

diff --git a/bus/bus.c b/bus/bus.c
index 864e48ba8ff443d6cd5756c955c363eeeaf5d44a..a28a267233237b82d596507fbd97d53e55fd78c9 100644 (file)
--- 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);