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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-26 11:00:43 +0300 (Fri, 26 Oct 2007)
New Revision: 14624

Added:
   projects/haf/trunk/dbus/debian/patches/30-fix-dbus-get-local-machine-id.patch
Modified:
   projects/haf/trunk/dbus/debian/changelog
Log:
fixes to dbus_get_local_machine_id


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2007-10-26 07:35:37 UTC (rev 14623)
+++ projects/haf/trunk/dbus/debian/changelog	2007-10-26 08:00:43 UTC (rev 14624)
@@ -16,6 +16,7 @@
     _dbus_connection_get_next_client_serial.
   * Add one more OOM check to return_uuid.
   * Add one more OOM check to _dbus_get_autolaunch_address.
+  * Fixes to dbus_get_local_machine_id.
 
  -- 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/30-fix-dbus-get-local-machine-id.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/30-fix-dbus-get-local-machine-id.patch	2007-10-26 07:35:37 UTC (rev 14623)
+++ projects/haf/trunk/dbus/debian/patches/30-fix-dbus-get-local-machine-id.patch	2007-10-26 08:00:43 UTC (rev 14624)
@@ -0,0 +1,20 @@
+diff -pur dbus-1.0.2/dbus/dbus-misc.c dbus-1.0.2.new/dbus/dbus-misc.c
+--- dbus-1.0.2/dbus/dbus-misc.c	2006-12-11 21:21:05.000000000 +0200
++++ dbus-1.0.2.new/dbus/dbus-misc.c	2007-10-26 10:48:25.740378320 +0300
+@@ -76,12 +76,14 @@ dbus_get_local_machine_id (void)
+   char *s;
+ 
+   s = NULL;
+-  _dbus_string_init (&uuid);
++  if (!_dbus_string_init (&uuid))
++    return NULL;
++
+   if (!_dbus_get_local_machine_uuid_encoded (&uuid) ||
+       !_dbus_string_steal_data (&uuid, &s))
+     {
+       _dbus_string_free (&uuid);
+-      return FALSE;
++      return NULL;
+     }
+   else
+     {