add OOM handling in various places

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

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

	* dbus/dbus-sysdeps-unix (_dbus_get_autolaunch_address): handle OOM
	(FDO Bug #12945)

	* dbus/dbus-uuidgen.c (return_uuid): handle OOM (FDO Bug #12928)

	* dbus/dbus-misc.c (dbus_get_local_machine_id): handle OOM, fix return
	value to return NULL not FALSE (FDO Bug #12946)

diff --git a/ChangeLog b/ChangeLog
index b254f8e..72e5033 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2008-01-15  John (J5) Palmieri  <johnp@redhat.com>
 
+       * patches by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>
+
+       * dbus/dbus-sysdeps-unix (_dbus_get_autolaunch_address): handle OOM
+       (FDO Bug #12945)
+
+       * dbus/dbus-uuidgen.c (return_uuid): handle OOM (FDO Bug #12928)
+
+       * dbus/dbus-misc.c (dbus_get_local_machine_id): handle OOM, fix return
+       value to return NULL not FALSE (FDO Bug #12946)
+
+2008-01-15  John (J5) Palmieri  <johnp@redhat.com>
+
        * bus/bus.c (bus_context_check_security_policy): rewrite selinux error
        handling to not abort due to a NULL read and to set the error only if
        it is not already set (Based off of FDO Bug #12430)

diff --git a/dbus/dbus-misc.c b/dbus/dbus-misc.c
index 22b7333..758e1a0 100644 (file)
--- a/dbus/dbus-misc.c
+++ b/dbus/dbus-misc.c
@@ -76,12 +76,15 @@ 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
     {

diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index c4866bb..dfa71e7 100644 (file)
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -2777,7 +2777,11 @@ _dbus_get_autolaunch_address (DBusString *address,
   _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))
     {

diff --git a/dbus/dbus-uuidgen.c b/dbus/dbus-uuidgen.c
index 0038cd7..6f226bc 100644 (file)
--- a/dbus/dbus-uuidgen.c
+++ b/dbus/dbus-uuidgen.c
@@ -48,7 +48,13 @@ return_uuid (DBusGUID   *uuid,
   if (uuid_p)
     {
       DBusString encoded;
-      _dbus_string_init (&encoded);
+
+      if (!_dbus_string_init (&encoded))
+        {
+          _DBUS_SET_OOM (error);
+          return FALSE;
+        }
+
       if (!_dbus_uuid_encode (uuid, &encoded) ||
           !_dbus_string_steal_data (&encoded, uuid_p))
         {