packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

variantutil: Fix gcc `-fanalyzer` warnin 

Add some not-NULL assertions for return values from glib,
and upgrade some `g_return_if_fail` to `g_assert`.
This commit is contained in:
Colin Walters 2021-10-08 08:59:52 -04:00
parent 54bf42c3e5
commit 029a9d56c3
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libotutil/ot-variant-builder.c
View File

@ -909,6 +909,7 @@ ot_variant_builder_pre_add (OtVariantBuilderInfo *info,
const GVariantMemberInfo *member_info; const GVariantMemberInfo *member_info;
member_info = g_variant_type_info_member_info (info->type_info, info->n_children); member_info = g_variant_type_info_member_info (info->type_info, info->n_children);
g_assert (member_info);
alignment = member_info->type_info->alignment; alignment = member_info->type_info->alignment;
} }
else if (g_variant_type_is_array (info->type)) else if (g_variant_type_is_array (info->type))
@ -959,6 +960,7 @@ ot_variant_builder_post_add (OtVariantBuilderInfo *info,
const GVariantMemberInfo *member_info; const GVariantMemberInfo *member_info;
member_info = g_variant_type_info_member_info (info->type_info, info->n_children); member_info = g_variant_type_info_member_info (info->type_info, info->n_children);
g_assert (member_info);
if (member_info->ending_type == G_VARIANT_MEMBER_ENDING_OFFSET) if (member_info->ending_type == G_VARIANT_MEMBER_ENDING_OFFSET)
ot_variant_builder_add_child_end (info); ot_variant_builder_add_child_end (info);
} }
@ -1085,16 +1087,13 @@ ot_variant_builder_open (OtVariantBuilder *builder,
OtVariantBuilderInfo *info = builder->head; OtVariantBuilderInfo *info = builder->head;
OtVariantBuilderInfo *new_info; OtVariantBuilderInfo *new_info;
g_return_val_if_fail (info->n_children < info->max_items, g_assert (info->n_children < info->max_items);
FALSE); g_assert (!info->expected_type ||
g_return_val_if_fail (!info->expected_type ||
g_variant_type_is_subtype_of (type, g_variant_type_is_subtype_of (type,
info->expected_type), info->expected_type));
FALSE); g_assert (!info->prev_item_type ||
g_return_val_if_fail (!info->prev_item_type ||
g_variant_type_is_subtype_of (info->prev_item_type, g_variant_type_is_subtype_of (info->prev_item_type,
type), type));
FALSE);
if (!ot_variant_builder_pre_add (info, type, error)) if (!ot_variant_builder_pre_add (info, type, error))
return FALSE; return FALSE;