add OOM handling

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

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

	* dbus/dbus-internals.c (_dbus_read_uuid_file_without_creating,
	_dbus_create_uuid_file_exclusively): add OOM handling (FDO Bug #12952)

diff --git a/ChangeLog b/ChangeLog
index 247c09e7b53aab44bae6f8bc3d2e146d9b9f7422..88d0a5723c4e81145296ef338d2375bca7ce7554 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-15  John (J5) Palmieri  <johnp@redhat.com>
+
+       * patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>
+
+       * dbus/dbus-internals.c (_dbus_read_uuid_file_without_creating,
+       _dbus_create_uuid_file_exclusively): add OOM handling
+
 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/dbus/dbus-internals.c b/dbus/dbus-internals.c
index c99bee1a3576436a046bd0bff4e35f36edbbbb60..f3ca7c55a725b0025eb37de4f1318e75ebdf1be1 100644 (file)
--- a/dbus/dbus-internals.c
+++ b/dbus/dbus-internals.c
@@ -543,8 +543,18 @@ _dbus_read_uuid_file_without_creating (const DBusString *filename,
   DBusString decoded;
   int end;
   
-  _dbus_string_init (&contents);
-  _dbus_string_init (&decoded);
+  if (!_dbus_string_init (&contents))
+    {
+      _DBUS_SET_OOM (error);
+      return FALSE;
+    }
+
+  if (!_dbus_string_init (&decoded))
+    {
+      _dbus_string_free (&contents);
+      _DBUS_SET_OOM (error);
+      return FALSE;
+    }
   
   if (!_dbus_file_get_contents (&contents, filename, error))
     goto error;
@@ -608,7 +618,11 @@ _dbus_create_uuid_file_exclusively (const DBusString *filename,
 {
   DBusString encoded;
 
-  _dbus_string_init (&encoded);
+  if (!_dbus_string_init (&encoded))
+    {
+      _DBUS_SET_OOM (error);
+      return FALSE;
+    }
 
   _dbus_generate_uuid (uuid);