luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-09 02:46:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

gvariant: Fix some memory leaks on error paths

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

22
glib/gvariant.c
View File

@ -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);