diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2008-01-15 14:43:19 -0500 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2008-01-15 14:43:19 -0500 |
| commit | 85d7a8e4d7e192ab886633f0a223cc9abb47e506 (patch) | |
| tree | e32bd21aa520e4bcdc34af0377446e8a48396e27 /dbus/dbus-uuidgen.c | |
| parent | 9db435926fb82409caa2b5a7139781a95f105a63 (diff) | |
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)
Diffstat (limited to 'dbus/dbus-uuidgen.c')
| -rw-r--r-- | dbus/dbus-uuidgen.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/dbus/dbus-uuidgen.c b/dbus/dbus-uuidgen.c index 0038cd74..6f226bce 100644 --- 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)) { |