2006-02-24 John (J5) Palmieri <johnp@redhat.com>

* patch from Sjoerd Simons <sjoerd at debian.org>:

	* dbus/dbus-sysdeps-util.c (_dbus_group_info_free): Moved to
	dbus/dbus-sysdeps.c

	* dbus/dbus-userdb.c (_dbus_group_info_free_allocated): Don't
	call _dbus_group_info_free_allocated which causes infinite loop,
	correctly call _dbus_group_info_free
This commit is contained in:
John (J5) Palmieri 2006-02-24 16:13:08 +00:00
parent ea1cfd0b95
commit a2866f7366
4 changed files with 23 additions and 12 deletions

View file

@ -1,3 +1,14 @@
2006-02-24 John (J5) Palmieri <johnp@redhat.com>
* patch from Sjoerd Simons <sjoerd at debian.org>:
* dbus/dbus-sysdeps-util.c (_dbus_group_info_free): Moved to
dbus/dbus-sysdeps.c
* dbus/dbus-userdb.c (_dbus_group_info_free_allocated): Don't
call _dbus_group_info_free_allocated which causes infinite loop,
correctly call _dbus_group_info_free
2006-02-20 Thiago Macieira <thiago.macieira@trolltech.com>
* qt/qdbusinterface_p.h:

View file

@ -680,17 +680,6 @@ _dbus_group_info_fill_gid (DBusGroupInfo *info,
return fill_group_info (info, gid, NULL, error);
}
/**
* Frees the members of info (but not info itself).
*
* @param info the group info
*/
void
_dbus_group_info_free (DBusGroupInfo *info)
{
dbus_free (info->groupname);
}
/** @} */ /* End of DBusInternalsUtils functions */
/**

View file

@ -1753,6 +1753,17 @@ _dbus_user_info_free (DBusUserInfo *info)
dbus_free (info->homedir);
}
/**
* Frees the members of info (but not info itself).
*
* @param info the group info
*/
void
_dbus_group_info_free (DBusGroupInfo *info)
{
dbus_free (info->groupname);
}
/**
* Sets fields in DBusCredentials to DBUS_PID_UNSET,
* DBUS_UID_UNSET, DBUS_GID_UNSET.

View file

@ -61,7 +61,7 @@ _dbus_group_info_free_allocated (DBusGroupInfo *info)
if (info == NULL) /* hash table will pass NULL */
return;
_dbus_group_info_free_allocated (info);
_dbus_group_info_free (info);
dbus_free (info);
}