luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 19:36:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix memory leak in g_bookmark_file_parse()

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=669334

Signed-off-by: Ravi Sankar Guntur <ravi.g@samsung.com>
This commit is contained in:
Ravi Sankar Guntur 2012-02-04 00:14:56 +05:30 committed by Colin Walters
parent 7e3eeb2ba1
commit 59a0134de8
1 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
glib/gbookmarkfile.c
View File

@ -1418,9 +1418,9 @@ static const GMarkupParser markup_parser =
static gboolean
g_bookmark_file_parse (GBookmarkFile *bookmark,
const gchar *buffer,
gsize length,
GError **error)
const gchar *buffer,
gsize length,
GError **error)
{
GMarkupParseContext *context;
ParseData *parse_data;
@ -1431,6 +1431,9 @@ g_bookmark_file_parse (GBookmarkFile *bookmark,
if (!buffer)
return FALSE;
parse_error = NULL;
end_error = NULL;
if (length == (gsize) -1)
length = strlen (buffer);
@ -1443,30 +1446,22 @@ g_bookmark_file_parse (GBookmarkFile *bookmark,
parse_data,
(GDestroyNotify) parse_data_free);
parse_error = NULL;
retval = g_markup_parse_context_parse (context,
buffer,
length,
&parse_error);
if (!retval)
{
g_propagate_error (error, parse_error);
return FALSE;
}
end_error = NULL;
retval = g_markup_parse_context_end_parse (context, &end_error);
if (!retval)
{
g_propagate_error (error, end_error);
return FALSE;
}
g_propagate_error (error, parse_error);
else
{
retval = g_markup_parse_context_end_parse (context, &end_error);
if (!retval)
g_propagate_error (error, end_error);
}
g_markup_parse_context_free (context);
return TRUE;
return retval;
}
static gchar *
@ -1685,14 +1680,11 @@ g_bookmark_file_load_from_data (GBookmarkFile *bookmark,
parse_error = NULL;
retval = g_bookmark_file_parse (bookmark, data, length, &parse_error);
if (!retval)
{
g_propagate_error (error, parse_error);
return FALSE;
}
return TRUE;
g_propagate_error (error, parse_error);
return retval;
}
/**