diff options
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/dbus-misc.c | 7 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps-unix.c | 6 | ||||
| -rw-r--r-- | dbus/dbus-uuidgen.c | 8 |
3 files changed, 17 insertions, 4 deletions
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 { diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c index c4866bbb..dfa71e7d 100644 --- 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 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)) { |