applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

common: Fix crash when filtering language list

Browse source 
And it's still being populated. If the list gets filtered
while it's being populated, we would end up with a row with NULL
data, causing us to crash.

Make sure to hold the GDK threads lock when reading from the list,
to avoid racing with the insert code.

http://bugzilla.gnome.org/show_bug.cgi?id=672293
This commit is contained in:
Bastien Nocera 2012-03-27 13:44:44 +02:00
parent 49ec6af014
commit ee3f0720f2
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
panels/common/cc-language-chooser.c
View file

@ -46,10 +46,13 @@ cc_language_chooser_get_language (GtkWidget *chooser)
tv = (GtkTreeView *) g_object_get_data (G_OBJECT (chooser), "list"); tv = (GtkTreeView *) g_object_get_data (G_OBJECT (chooser), "list");
selection = gtk_tree_view_get_selection (tv); selection = gtk_tree_view_get_selection (tv);
gdk_threads_enter ();
if (gtk_tree_selection_get_selected (selection, &model, &iter)) if (gtk_tree_selection_get_selected (selection, &model, &iter))
gtk_tree_model_get (model, &iter, LOCALE_COL, &lang, -1); gtk_tree_model_get (model, &iter, LOCALE_COL, &lang, -1);
else else
lang = NULL; lang = NULL;
gdk_threads_leave ();
return lang; return lang;
} }
@ -245,7 +248,10 @@ filter_languages (GtkTreeModel *model,
return TRUE; return TRUE;
} }
gdk_threads_enter ();
gtk_tree_model_get (model, iter, DISPLAY_LOCALE_COL, &locale, -1); gtk_tree_model_get (model, iter, DISPLAY_LOCALE_COL, &locale, -1);
gdk_threads_leave ();
l = g_utf8_casefold (locale, -1); l = g_utf8_casefold (locale, -1);
visible = strstr (l, filter_string) != NULL; visible = strstr (l, filter_string) != NULL;