luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 15:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gvariant: Factor out type check

Browse Source 
This will help static analysers, similarly to with the previous commit.

This introduces no functional changes.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2022-05-10 16:29:22 +01:00
parent e36f2bb243
commit e0fe616dbc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glib/gvariant.c
View File

@ -800,12 +800,13 @@ g_variant_new_array (const GVariantType *child_type,
for (i = 0; i < n_children; i++)
{
if G_UNLIKELY (!g_variant_is_of_type (children[i], child_type))
gboolean is_of_child_type = g_variant_is_of_type (children[i], child_type);
if G_UNLIKELY (!is_of_child_type)
{
while (i != 0)
g_variant_unref (my_children[--i]);
g_free (my_children);
g_return_val_if_fail (g_variant_is_of_type (children[i], child_type), NULL);
g_return_val_if_fail (is_of_child_type, NULL);
}
my_children[i] = g_variant_ref_sink (children[i]);
trusted &= g_variant_is_trusted (children[i]);