Commit e75c67a2 authored by Simon McVittie's avatar Simon McVittie
Browse files

Merge branch 'issue305' into 'master'

userdb: Reference-count DBusUserInfo, DBusGroupInfo

Closes #305

See merge request !166
parents ce9682ec 2b7948ef
......@@ -105,6 +105,7 @@ typedef struct DBusGroupInfo DBusGroupInfo;
*/
struct DBusUserInfo
{
size_t refcount; /**< Reference count */
dbus_uid_t uid; /**< UID */
dbus_gid_t primary_gid; /**< GID */
dbus_gid_t *group_ids; /**< Groups IDs, *including* above primary group */
......@@ -118,6 +119,7 @@ struct DBusUserInfo
*/
struct DBusGroupInfo
{
size_t refcount; /**< Reference count */
dbus_gid_t gid; /**< GID */
char *groupname; /**< Group name */
};
......
......@@ -45,6 +45,15 @@
* @{
*/
static DBusGroupInfo *
_dbus_group_info_ref (DBusGroupInfo *info)
{
_dbus_assert (info->refcount > 0);
_dbus_assert (info->refcount < SIZE_MAX);
info->refcount++;
return info;
}
/**
* Checks to see if the UID sent in is the console user
*
......@@ -249,9 +258,9 @@ _dbus_get_user_id_and_primary_group (const DBusString *username,
* @param gid the group ID or #DBUS_GID_UNSET
* @param groupname group name or #NULL
* @param error error to fill in
* @returns the entry in the database
* @returns the entry in the database (borrowed, do not free)
*/
DBusGroupInfo*
const DBusGroupInfo *
_dbus_user_database_lookup_group (DBusUserDatabase *db,
dbus_gid_t gid,
const DBusString *groupname,
......@@ -296,13 +305,14 @@ _dbus_user_database_lookup_group (DBusUserDatabase *db,
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
return NULL;
}
info->refcount = 1;
if (gid != DBUS_GID_UNSET)
{
if (!_dbus_group_info_fill_gid (info, gid, error))
{
_DBUS_ASSERT_ERROR_IS_SET (error);
_dbus_group_info_free_allocated (info);
_dbus_group_info_unref (info);
return NULL;
}
}
......@@ -311,7 +321,7 @@ _dbus_user_database_lookup_group (DBusUserDatabase *db,
if (!_dbus_group_info_fill (info, groupname, error))
{
_DBUS_ASSERT_ERROR_IS_SET (error);
_dbus_group_info_free_allocated (info);
_dbus_group_info_unref (info);
return NULL;
}
}
......@@ -320,23 +330,37 @@ _dbus_user_database_lookup_group (DBusUserDatabase *db,
gid = DBUS_GID_UNSET;
groupname = NULL;
if (!_dbus_hash_table_insert_uintptr (db->groups, info->gid, info))
if (_dbus_hash_table_insert_uintptr (db->groups, info->gid, info))
{
_dbus_group_info_ref (info);
}
else
{
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
_dbus_group_info_free_allocated (info);
_dbus_group_info_unref (info);
return NULL;
}
if (!_dbus_hash_table_insert_string (db->groups_by_name,
info->groupname,
info))
if (_dbus_hash_table_insert_string (db->groups_by_name,
info->groupname,
info))
{
_dbus_group_info_ref (info);
}
else
{
_dbus_hash_table_remove_uintptr (db->groups, info->gid);
_dbus_group_info_unref (info);
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
return NULL;
}
/* Release the original reference */
_dbus_group_info_unref (info);
/* Return a borrowed reference to the DBusGroupInfo owned by the
* two hash tables */
return info;
}
}
......
......@@ -42,34 +42,57 @@
* @{
*/
static DBusUserInfo *
_dbus_user_info_ref (DBusUserInfo *info)
{
_dbus_assert (info->refcount > 0);
_dbus_assert (info->refcount < SIZE_MAX);
info->refcount++;
return info;
}
/**
* Frees the given #DBusUserInfo's members with _dbus_user_info_free()
* Decrements the reference count. If it reaches 0,
* frees the given #DBusUserInfo's members with _dbus_user_info_free()
* and also calls dbus_free() on the block itself
*
* @param info the info
*/
void
_dbus_user_info_free_allocated (DBusUserInfo *info)
_dbus_user_info_unref (DBusUserInfo *info)
{
if (info == NULL) /* hash table will pass NULL */
return;
_dbus_assert (info->refcount > 0);
_dbus_assert (info->refcount < SIZE_MAX);
if (--info->refcount > 0)
return;
_dbus_user_info_free (info);
dbus_free (info);
}
/**
* Frees the given #DBusGroupInfo's members with _dbus_group_info_free()
* Decrements the reference count. If it reaches 0,
* frees the given #DBusGroupInfo's members with _dbus_group_info_free()
* and also calls dbus_free() on the block itself
*
* @param info the info
*/
void
_dbus_group_info_free_allocated (DBusGroupInfo *info)
_dbus_group_info_unref (DBusGroupInfo *info)
{
if (info == NULL) /* hash table will pass NULL */
return;
_dbus_assert (info->refcount > 0);
_dbus_assert (info->refcount < SIZE_MAX);
if (--info->refcount > 0)
return;
_dbus_group_info_free (info);
dbus_free (info);
}
......@@ -129,9 +152,9 @@ _dbus_is_a_number (const DBusString *str,
* @param uid the user ID or #DBUS_UID_UNSET
* @param username username or #NULL
* @param error error to fill in
* @returns the entry in the database
* @returns the entry in the database (borrowed, do not free)
*/
DBusUserInfo*
const DBusUserInfo *
_dbus_user_database_lookup (DBusUserDatabase *db,
dbus_uid_t uid,
const DBusString *username,
......@@ -177,13 +200,14 @@ _dbus_user_database_lookup (DBusUserDatabase *db,
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
return NULL;
}
info->refcount = 1;
if (uid != DBUS_UID_UNSET)
{
if (!_dbus_user_info_fill_uid (info, uid, error))
{
_DBUS_ASSERT_ERROR_IS_SET (error);
_dbus_user_info_free_allocated (info);
_dbus_user_info_unref (info);
return NULL;
}
}
......@@ -192,7 +216,7 @@ _dbus_user_database_lookup (DBusUserDatabase *db,
if (!_dbus_user_info_fill (info, username, error))
{
_DBUS_ASSERT_ERROR_IS_SET (error);
_dbus_user_info_free_allocated (info);
_dbus_user_info_unref (info);
return NULL;
}
}
......@@ -202,22 +226,35 @@ _dbus_user_database_lookup (DBusUserDatabase *db,
username = NULL;
/* insert into hash */
if (!_dbus_hash_table_insert_uintptr (db->users, info->uid, info))
if (_dbus_hash_table_insert_uintptr (db->users, info->uid, info))
{
_dbus_user_info_ref (info);
}
else
{
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
_dbus_user_info_free_allocated (info);
_dbus_user_info_unref (info);
return NULL;
}
if (!_dbus_hash_table_insert_string (db->users_by_name,
info->username,
info))
if (_dbus_hash_table_insert_string (db->users_by_name,
info->username,
info))
{
_dbus_user_info_ref (info);
}
else
{
_dbus_hash_table_remove_uintptr (db->users, info->uid);
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
_dbus_user_info_unref (info);
return NULL;
}
_dbus_user_info_unref (info);
/* Return a borrowed pointer to the DBusUserInfo owned by the
* hash tables */
return info;
}
}
......@@ -567,24 +604,24 @@ _dbus_user_database_new (void)
db->refcount = 1;
db->users = _dbus_hash_table_new (DBUS_HASH_UINTPTR,
NULL, (DBusFreeFunction) _dbus_user_info_free_allocated);
NULL, (DBusFreeFunction) _dbus_user_info_unref);
if (db->users == NULL)
goto failed;
db->groups = _dbus_hash_table_new (DBUS_HASH_UINTPTR,
NULL, (DBusFreeFunction) _dbus_group_info_free_allocated);
NULL, (DBusFreeFunction) _dbus_group_info_unref);
if (db->groups == NULL)
goto failed;
db->users_by_name = _dbus_hash_table_new (DBUS_HASH_STRING,
NULL, NULL);
NULL, (DBusFreeFunction) _dbus_user_info_unref);
if (db->users_by_name == NULL)
goto failed;
db->groups_by_name = _dbus_hash_table_new (DBUS_HASH_STRING,
NULL, NULL);
NULL, (DBusFreeFunction) _dbus_group_info_unref);
if (db->groups_by_name == NULL)
goto failed;
......
......@@ -67,19 +67,19 @@ dbus_bool_t _dbus_user_database_get_username (DBusUserDatabase *db,
const DBusUserInfo **info,
DBusError *error);
DBUS_PRIVATE_EXPORT
DBusUserInfo* _dbus_user_database_lookup (DBusUserDatabase *db,
const DBusUserInfo *_dbus_user_database_lookup (DBusUserDatabase *db,
dbus_uid_t uid,
const DBusString *username,
DBusError *error);
DBUS_PRIVATE_EXPORT
DBusGroupInfo* _dbus_user_database_lookup_group (DBusUserDatabase *db,
dbus_gid_t gid,
const DBusString *groupname,
DBusError *error);
DBUS_PRIVATE_EXPORT
void _dbus_user_info_free_allocated (DBusUserInfo *info);
const DBusGroupInfo* _dbus_user_database_lookup_group (DBusUserDatabase *db,
dbus_gid_t gid,
const DBusString *groupname,
DBusError *error);
void _dbus_user_info_unref (DBusUserInfo *info);
DBUS_PRIVATE_EXPORT
void _dbus_group_info_free_allocated (DBusGroupInfo *info);
void _dbus_group_info_unref (DBusGroupInfo *info);
#endif /* DBUS_USERDB_INCLUDES_PRIVATE */
DBUS_PRIVATE_EXPORT
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment