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

gsettings: Fix some memory leaks on error paths

Browse Source 
Coverity CID: #1393949
Signed-off-by: Philip Withnall <philip@tecnocode.co.uk>
This commit is contained in:
Philip Withnall 2018-07-17 12:14:07 +02:00
parent 2c79b357b2
commit b5948c1a39
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/gsettings.c
View File

@ -2921,10 +2921,12 @@ g_settings_bind_with_mapping (GSettings *settings,
if (!g_variant_type_equal (binding->key.type, G_VARIANT_TYPE_BOOLEAN)) 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 " g_critical ("g_settings_bind: G_SETTINGS_BIND_INVERT_BOOLEAN "
"was specified, but key '%s' on schema '%s' has " "was specified, but key '%s' on schema '%s' has "
"type '%s'", key, g_settings_schema_get_id (settings->priv->schema), "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; return;
} }
@ -2935,12 +2937,14 @@ g_settings_bind_with_mapping (GSettings *settings,
!g_settings_mapping_is_compatible (binding->property->value_type, !g_settings_mapping_is_compatible (binding->property->value_type,
binding->key.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 " g_critical ("g_settings_bind: property '%s' on class '%s' has type "
"'%s' which is not compatible with type '%s' of key '%s' " "'%s' which is not compatible with type '%s' of key '%s' "
"on schema '%s'", binding->property->name, G_OBJECT_TYPE_NAME (object), "on schema '%s'", binding->property->name, G_OBJECT_TYPE_NAME (object),
g_type_name (binding->property->value_type), 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_settings_schema_get_id (settings->priv->schema));
g_free (type_string);
return; return;
} }