callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'gtk3-fontchooser-fix' into 'gtk-3-24'

Browse Source 
Fix a critical in GtkFontChooserWidget

See merge request GNOME/gtk!5027
This commit is contained in:
Matthias Clasen 2022-09-13 13:19:57 +00:00
commit cbfec14df4
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkfontchooserwidget.c
View File

@ -963,11 +963,12 @@ gtk_font_chooser_widget_load_fonts (GtkFontChooserWidget *fontchooser,
if ((priv->level & GTK_FONT_CHOOSER_LEVEL_STYLE) == 0) if ((priv->level & GTK_FONT_CHOOSER_LEVEL_STYLE) == 0)
{ {
GtkDelayedFontDescription *desc; GtkDelayedFontDescription *desc;
PangoFontFace *face; PangoFontFace *face = NULL;
#if PANGO_VERSION_CHECK(1,46,0) #if PANGO_VERSION_CHECK(1,46,0)
face = pango_font_family_get_face (families[i], NULL); face = pango_font_family_get_face (families[i], NULL);
#else #endif
if (!face)
{ {
PangoFontFace **faces; PangoFontFace **faces;
int j, n_faces; int j, n_faces;
@ -981,9 +982,10 @@ gtk_font_chooser_widget_load_fonts (GtkFontChooserWidget *fontchooser,
break; break;
} }
} }
g_free (faces); g_free (faces);
} }
#endif
desc = gtk_delayed_font_description_new (face); desc = gtk_delayed_font_description_new (face);
gtk_list_store_insert_with_values (list_store, &iter, -1, gtk_list_store_insert_with_values (list_store, &iter, -1,