AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

dialog: Avoid a memory leak in an error case

Browse Source 
Parsing <action-widgets> could sometimes fail to free
some of the data, if a nonexisting widget is referenced.
Found by gcc's leak sanitizer.
This commit is contained in:
Matthias Clasen 2016-02-26 14:50:25 -05:00
parent 6108c646c5
commit 5ca860dcaf
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkdialog.c
View File

@ -1687,6 +1687,15 @@ typedef struct {
gint col; gint col;
} SubParserData; } SubParserData;
static void
free_action_widget_info (gpointer data)
{
ActionWidgetInfo *item = data;
g_free (item->widget_name);
g_free (item);
}
static void static void
parser_start_element (GMarkupParseContext *context, parser_start_element (GMarkupParseContext *context,
const gchar *element_name, const gchar *element_name,
@ -1894,12 +1903,9 @@ gtk_dialog_buildable_custom_finished (GtkBuildable *buildable,
if (item->is_default) if (item->is_default)
gtk_widget_grab_default (GTK_WIDGET (object)); gtk_widget_grab_default (GTK_WIDGET (object));
g_free (item->widget_name);
g_free (item);
} }
g_slist_free (data->items); g_slist_free_full (data->items, free_action_widget_info);
g_string_free (data->string, TRUE); g_string_free (data->string, TRUE);
g_slice_free (SubParserData, data); g_slice_free (SubParserData, data);