fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 00:37:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add OOM handling in various places

Browse source 
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)
This commit is contained in:
John (J5) Palmieri 2008-01-15 14:43:19 -05:00
parent 9db435926f
commit 85d7a8e4d7
4 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
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

7
dbus/dbus-misc.c
View file

@ -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
{

6
dbus/dbus-sysdeps-unix.c
View file

@ -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))
{

8
dbus/dbus-uuidgen.c
View file

@ -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))
{