From 85d7a8e4d7e192ab886633f0a223cc9abb47e506 Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Tue, 15 Jan 2008 14:43:19 -0500 Subject: add OOM handling in various places MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2008-01-15 John (J5) Palmieri * patches by Kimmo Hämäläinen * 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) --- dbus/dbus-misc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'dbus/dbus-misc.c') diff --git a/dbus/dbus-misc.c b/dbus/dbus-misc.c index 22b7333e..758e1a02 100644 --- 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 { -- cgit