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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-26 10:35:37 +0300 (Fri, 26 Oct 2007)
New Revision: 14623

Added:
   projects/haf/trunk/dbus/debian/patches/29-add-oom-check2.patch
Modified:
   projects/haf/trunk/dbus/debian/changelog
Log:
add OOM check to _dbus_get_autolaunch_address


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2007-10-26 06:35:45 UTC (rev 14622)
+++ projects/haf/trunk/dbus/debian/changelog	2007-10-26 07:35:37 UTC (rev 14623)
@@ -15,6 +15,7 @@
   * Transform dead code into working code in
     _dbus_connection_get_next_client_serial.
   * Add one more OOM check to return_uuid.
+  * Add one more OOM check to _dbus_get_autolaunch_address.
 
  -- 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/29-add-oom-check2.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/29-add-oom-check2.patch	2007-10-26 06:35:45 UTC (rev 14622)
+++ projects/haf/trunk/dbus/debian/patches/29-add-oom-check2.patch	2007-10-26 07:35:37 UTC (rev 14623)
@@ -0,0 +1,16 @@
+diff -pur dbus-1.0.2/dbus/dbus-sysdeps-unix.c dbus-1.0.2.new/dbus/dbus-sysdeps-unix.c
+--- dbus-1.0.2/dbus/dbus-sysdeps-unix.c	2006-12-11 21:21:09.000000000 +0200
++++ dbus-1.0.2.new/dbus/dbus-sysdeps-unix.c	2007-10-26 10:32:10.409651128 +0300
+@@ -2382,7 +2382,11 @@ _dbus_get_autolaunch_address (DBusString
+   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
+   retval = FALSE;
+ 
+-  _dbus_string_init (&uuid);
++  if (!_dbus_string_init (&uuid))
++    {
++      _DBUS_SET_OOM (error);
++      return FALSE;
++    }
+   
+   if (!_dbus_get_local_machine_uuid_encoded (&uuid))
+     {