luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-05 15:38:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

gibaseinfo: Allow gi_base_info_clear() to be idempotent

Browse Source 
When called on an already-cleared `GIBaseInfo` it should do nothing.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>

Fixes: #3255
This commit is contained in:
Philip Withnall
2024-02-14 11:51:08 +00:00
parent 48e3fa1e17
commit ec9a73a262
2 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
girepository/gibaseinfo.c
View File

@@ -443,7 +443,9 @@ gi_info_init (GIRealInfo *info,
* Clears memory allocated internally by a stack-allocated
* [type@GIRepository.BaseInfo].
*
* This does not deallocate the [type@GIRepository.BaseInfo] struct itself.
* This does not deallocate the [type@GIRepository.BaseInfo] struct itself. It
* does clear the struct to zero so that calling this function subsequent times
* on the same struct is a no-op.
*
* This must only be called on stack-allocated [type@GIRepository.BaseInfo]s.
* Use [method@GIRepository.BaseInfo.unref] for heap-allocated ones.
@@ -455,6 +457,11 @@ gi_base_info_clear (void *info)
{
GIBaseInfo *rinfo = (GIBaseInfo *) info;
/* If @info is zero-filled, do nothing. This allows gi_base_info_clear() to be
* used with g_auto(). */
if (rinfo->ref_count == 0)
return;
g_return_if_fail (GI_IS_BASE_INFO (rinfo));
g_assert (rinfo->ref_count == INVALID_REFCOUNT);
@@ -462,6 +469,8 @@ gi_base_info_clear (void *info)
GI_BASE_INFO_GET_CLASS (info)->finalize (rinfo);
g_type_class_unref (rinfo->parent_instance.g_class);
memset (rinfo, 0, sizeof (*rinfo));
}
GIBaseInfo *