From: John (J5) Palmieri <johnp@redhat.com>
Date: Tue, 15 Jan 2008 20:49:35 +0000 (-0500)
Subject: check failed allocation (FDO Bug #12920)
X-Git-Tag: dbus-1.1.3~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cc2bfa10e1a840e0da34a588f719779cc284a79;p=thirdparty%2Fdbus.git

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 dfa00b178..454717681 100644
--- 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 864e48ba8..a28a26723 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);