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

Do not use ensure_valid_* call in g_return_* macro

Browse Source 
Replace all instances of ensure_valid_builder or ensure_valid_dict
calls used as arguments to the g_return_if_fail or
g_return_value_if_fail macros with otherwise equivalent code that
always calls these functions, thus ensuring their side effects always
apply. This commit does not change any external or private interfaces.

Fixes #2612
This commit is contained in:
Alexander Klauer 2022-03-04 14:04:02 +00:00 committed by Philip Withnall
parent feb8ea45b9
commit 340bc1ca79
1 changed files with 49 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
glib/gvariant.c
View File

@ -3225,6 +3225,24 @@ ensure_valid_builder (GVariantBuilder *builder)
return is_valid_builder (builder); return is_valid_builder (builder);
} }
/* return_if_invalid_builder (b) is like
* g_return_if_fail (ensure_valid_builder (b)), except that
* the side effects of ensure_valid_builder are evaluated
* regardless of whether G_DISABLE_CHECKS is defined or not. */
#define return_if_invalid_builder(b) G_STMT_START { \
gboolean valid_builder G_GNUC_UNUSED = ensure_valid_builder (b); \
g_return_if_fail (valid_builder); \
} G_STMT_END
/* return_val_if_invalid_builder (b, val) is like
* g_return_val_if_fail (ensure_valid_builder (b), val), except that
* the side effects of ensure_valid_builder are evaluated
* regardless of whether G_DISABLE_CHECKS is defined or not. */
#define return_val_if_invalid_builder(b, val) G_STMT_START { \
gboolean valid_builder G_GNUC_UNUSED = ensure_valid_builder (b); \
g_return_val_if_fail (valid_builder, val); \
} G_STMT_END
/** /**
* g_variant_builder_new: * g_variant_builder_new:
* @type: a container type * @type: a container type
@ -3337,7 +3355,7 @@ g_variant_builder_clear (GVariantBuilder *builder)
/* all-zeros or partial case */ /* all-zeros or partial case */
return; return;
g_return_if_fail (ensure_valid_builder (builder)); return_if_invalid_builder (builder);
g_variant_type_free (GVSB(builder)->type); g_variant_type_free (GVSB(builder)->type);
@ -3500,7 +3518,7 @@ void
g_variant_builder_add_value (GVariantBuilder *builder, g_variant_builder_add_value (GVariantBuilder *builder,
GVariant *value) GVariant *value)
{ {
g_return_if_fail (ensure_valid_builder (builder)); return_if_invalid_builder (builder);
g_return_if_fail (GVSB(builder)->offset < GVSB(builder)->max_items); g_return_if_fail (GVSB(builder)->offset < GVSB(builder)->max_items);
g_return_if_fail (!GVSB(builder)->expected_type || g_return_if_fail (!GVSB(builder)->expected_type ||
g_variant_is_of_type (value, g_variant_is_of_type (value,
@ -3581,7 +3599,7 @@ g_variant_builder_open (GVariantBuilder *builder,
{ {
GVariantBuilder *parent; GVariantBuilder *parent;
g_return_if_fail (ensure_valid_builder (builder)); return_if_invalid_builder (builder);
g_return_if_fail (GVSB(builder)->offset < GVSB(builder)->max_items); g_return_if_fail (GVSB(builder)->offset < GVSB(builder)->max_items);
g_return_if_fail (!GVSB(builder)->expected_type || g_return_if_fail (!GVSB(builder)->expected_type ||
g_variant_type_is_subtype_of (type, g_variant_type_is_subtype_of (type,
@ -3627,7 +3645,7 @@ g_variant_builder_close (GVariantBuilder *builder)
{ {
GVariantBuilder *parent; GVariantBuilder *parent;
g_return_if_fail (ensure_valid_builder (builder)); return_if_invalid_builder (builder);
g_return_if_fail (GVSB(builder)->parent != NULL); g_return_if_fail (GVSB(builder)->parent != NULL);
parent = GVSB(builder)->parent; parent = GVSB(builder)->parent;
@ -3695,7 +3713,7 @@ g_variant_builder_end (GVariantBuilder *builder)
GVariantType *my_type; GVariantType *my_type;
GVariant *value; GVariant *value;
g_return_val_if_fail (ensure_valid_builder (builder), NULL); return_val_if_invalid_builder (builder, NULL);
g_return_val_if_fail (GVSB(builder)->offset >= GVSB(builder)->min_items, g_return_val_if_fail (GVSB(builder)->offset >= GVSB(builder)->min_items,
NULL); NULL);
g_return_val_if_fail (!GVSB(builder)->uniform_item_types || g_return_val_if_fail (!GVSB(builder)->uniform_item_types ||
@ -3883,6 +3901,24 @@ ensure_valid_dict (GVariantDict *dict)
return is_valid_dict (dict); return is_valid_dict (dict);
} }
/* return_if_invalid_dict (d) is like
* g_return_if_fail (ensure_valid_dict (d)), except that
* the side effects of ensure_valid_dict are evaluated
* regardless of whether G_DISABLE_CHECKS is defined or not. */
#define return_if_invalid_dict(d) G_STMT_START { \
gboolean valid_dict G_GNUC_UNUSED = ensure_valid_dict (d); \
g_return_if_fail (valid_dict); \
} G_STMT_END
/* return_val_if_invalid_dict (d, val) is like
* g_return_val_if_fail (ensure_valid_dict (d), val), except that
* the side effects of ensure_valid_dict are evaluated
* regardless of whether G_DISABLE_CHECKS is defined or not. */
#define return_val_if_invalid_dict(d, val) G_STMT_START { \
gboolean valid_dict G_GNUC_UNUSED = ensure_valid_dict (d); \
g_return_val_if_fail (valid_dict, val); \
} G_STMT_END
/** /**
* g_variant_dict_new: * g_variant_dict_new:
* @from_asv: (nullable): the #GVariant with which to initialise the * @from_asv: (nullable): the #GVariant with which to initialise the
@ -3990,7 +4026,7 @@ g_variant_dict_lookup (GVariantDict *dict,
GVariant *value; GVariant *value;
va_list ap; va_list ap;
g_return_val_if_fail (ensure_valid_dict (dict), FALSE); return_val_if_invalid_dict (dict, FALSE);
g_return_val_if_fail (key != NULL, FALSE); g_return_val_if_fail (key != NULL, FALSE);
g_return_val_if_fail (format_string != NULL, FALSE); g_return_val_if_fail (format_string != NULL, FALSE);
@ -4035,7 +4071,7 @@ g_variant_dict_lookup_value (GVariantDict *dict,
{ {
GVariant *result; GVariant *result;
g_return_val_if_fail (ensure_valid_dict (dict), NULL); return_val_if_invalid_dict (dict, NULL);
g_return_val_if_fail (key != NULL, NULL); g_return_val_if_fail (key != NULL, NULL);
result = g_hash_table_lookup (GVSD(dict)->values, key); result = g_hash_table_lookup (GVSD(dict)->values, key);
@ -4061,7 +4097,7 @@ gboolean
g_variant_dict_contains (GVariantDict *dict, g_variant_dict_contains (GVariantDict *dict,
const gchar *key) const gchar *key)
{ {
g_return_val_if_fail (ensure_valid_dict (dict), FALSE); return_val_if_invalid_dict (dict, FALSE);
g_return_val_if_fail (key != NULL, FALSE); g_return_val_if_fail (key != NULL, FALSE);
return g_hash_table_contains (GVSD(dict)->values, key); return g_hash_table_contains (GVSD(dict)->values, key);
@ -4089,7 +4125,7 @@ g_variant_dict_insert (GVariantDict *dict,
{ {
va_list ap; va_list ap;
g_return_if_fail (ensure_valid_dict (dict)); return_if_invalid_dict (dict);
g_return_if_fail (key != NULL); g_return_if_fail (key != NULL);
g_return_if_fail (format_string != NULL); g_return_if_fail (format_string != NULL);
@ -4115,7 +4151,7 @@ g_variant_dict_insert_value (GVariantDict *dict,
const gchar *key, const gchar *key,
GVariant *value) GVariant *value)
{ {
g_return_if_fail (ensure_valid_dict (dict)); return_if_invalid_dict (dict);
g_return_if_fail (key != NULL); g_return_if_fail (key != NULL);
g_return_if_fail (value != NULL); g_return_if_fail (value != NULL);
@ -4137,7 +4173,7 @@ gboolean
g_variant_dict_remove (GVariantDict *dict, g_variant_dict_remove (GVariantDict *dict,
const gchar *key) const gchar *key)
{ {
g_return_val_if_fail (ensure_valid_dict (dict), FALSE); return_val_if_invalid_dict (dict, FALSE);
g_return_val_if_fail (key != NULL, FALSE); g_return_val_if_fail (key != NULL, FALSE);
return g_hash_table_remove (GVSD(dict)->values, key); return g_hash_table_remove (GVSD(dict)->values, key);
@ -4171,7 +4207,7 @@ g_variant_dict_clear (GVariantDict *dict)
/* all-zeros case */ /* all-zeros case */
return; return;
g_return_if_fail (ensure_valid_dict (dict)); return_if_invalid_dict (dict);
g_hash_table_unref (GVSD(dict)->values); g_hash_table_unref (GVSD(dict)->values);
GVSD(dict)->values = NULL; GVSD(dict)->values = NULL;
@ -4202,7 +4238,7 @@ g_variant_dict_end (GVariantDict *dict)
GHashTableIter iter; GHashTableIter iter;
gpointer key, value; gpointer key, value;
g_return_val_if_fail (ensure_valid_dict (dict), NULL); return_val_if_invalid_dict (dict, NULL);
g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT); g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);