Commit bb8420f1 authored by Emmanuele Bassi's avatar Emmanuele Bassi 👣

Merge branch 'coverity' into 'master'

Minor memory leak fixes from Coverity

See merge request GNOME/glib!184
parents 7f55c768 e487df31
......@@ -106,6 +106,7 @@ handle_move (int argc, char *argv[], gboolean do_help)
if (do_help)
{
show_help (context, NULL);
g_option_context_free (context);
return 0;
}
......
......@@ -2921,10 +2921,12 @@ g_settings_bind_with_mapping (GSettings *settings,
if (!g_variant_type_equal (binding->key.type, G_VARIANT_TYPE_BOOLEAN))
{
gchar *type_string = g_variant_type_dup_string (binding->key.type);
g_critical ("g_settings_bind: G_SETTINGS_BIND_INVERT_BOOLEAN "
"was specified, but key '%s' on schema '%s' has "
"type '%s'", key, g_settings_schema_get_id (settings->priv->schema),
g_variant_type_dup_string (binding->key.type));
type_string);
g_free (type_string);
return;
}
......@@ -2935,12 +2937,14 @@ g_settings_bind_with_mapping (GSettings *settings,
!g_settings_mapping_is_compatible (binding->property->value_type,
binding->key.type))
{
gchar *type_string = g_variant_type_dup_string (binding->key.type);
g_critical ("g_settings_bind: property '%s' on class '%s' has type "
"'%s' which is not compatible with type '%s' of key '%s' "
"on schema '%s'", binding->property->name, G_OBJECT_TYPE_NAME (object),
g_type_name (binding->property->value_type),
g_variant_type_dup_string (binding->key.type), key,
type_string, key,
g_settings_schema_get_id (settings->priv->schema));
g_free (type_string);
return;
}
......
......@@ -4738,10 +4738,13 @@ g_variant_valist_new_nnp (const gchar **str,
type = g_variant_type_element (type);
if G_UNLIKELY (!g_variant_type_is_subtype_of (type, (GVariantType *) *str))
g_error ("g_variant_new: expected GVariantBuilder array element "
"type '%s' but the built value has element type '%s'",
g_variant_type_dup_string ((GVariantType *) *str),
g_variant_get_type_string (value) + 1);
{
gchar *type_string = g_variant_type_dup_string ((GVariantType *) *str);
g_error ("g_variant_new: expected GVariantBuilder array element "
"type '%s' but the built value has element type '%s'",
type_string, g_variant_get_type_string (value) + 1);
g_free (type_string);
}
g_variant_type_string_scan (*str, NULL, str);
......@@ -4803,10 +4806,13 @@ g_variant_valist_new_nnp (const gchar **str,
case '@':
if G_UNLIKELY (!g_variant_is_of_type (ptr, (GVariantType *) *str))
g_error ("g_variant_new: expected GVariant of type '%s' but "
"received value has type '%s'",
g_variant_type_dup_string ((GVariantType *) *str),
g_variant_get_type_string (ptr));
{
gchar *type_string = g_variant_type_dup_string ((GVariantType *) *str);
g_error ("g_variant_new: expected GVariant of type '%s' but "
"received value has type '%s'",
type_string, g_variant_get_type_string (ptr));
g_free (type_string);
}
g_variant_type_string_scan (*str, NULL, str);
......
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