[maemo-commits] [maemo-commits] r14611 - in projects/haf/trunk/dbus/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-25 13:47:34 +0300 (Thu, 25 Oct 2007)
New Revision: 14611

Added:
   projects/haf/trunk/dbus/debian/patches/24-check-failed-alloc.patch
Modified:
   projects/haf/trunk/dbus/debian/changelog
Log:
added check for failed allocation


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2007-10-25 10:36:28 UTC (rev 14610)
+++ projects/haf/trunk/dbus/debian/changelog	2007-10-25 10:47:34 UTC (rev 14611)
@@ -8,6 +8,7 @@
   * Added a missing va_end call to dbus_set_error.
   * Use ssize_t instead of size_t to store read(2) return value.
   * Added a missing NULL check to _dbus_spawn_async_with_babysitter.
+  * Added a check for failing allocation to bus.c:setup_server.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 18 Oct 2007 11:21:11 +0300
 

Added: projects/haf/trunk/dbus/debian/patches/24-check-failed-alloc.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/24-check-failed-alloc.patch	2007-10-25 10:36:28 UTC (rev 14610)
+++ projects/haf/trunk/dbus/debian/patches/24-check-failed-alloc.patch	2007-10-25 10:47:34 UTC (rev 14611)
@@ -0,0 +1,16 @@
+diff -pur dbus-1.0.2/bus/bus.c dbus-1.0.2.new/bus/bus.c
+--- dbus-1.0.2/bus/bus.c	2006-12-11 21:21:23.000000000 +0200
++++ dbus-1.0.2.new/bus/bus.c	2007-10-25 13:44:06.024337968 +0300
+@@ -207,9 +207,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);