summaryrefslogtreecommitdiff
path: root/pango/pangofc-shape.c
diff options
context:
space:
mode:
authorCarsten Pfeiffer <carsten.pfeiffer@gebit.de>2018-08-10 16:06:20 +0200
committerCarsten Pfeiffer <carsten.pfeiffer@gebit.de>2018-08-10 16:23:47 +0200
commitad92e199f221499c19f22dce7a16e7d770ad3ae7 (patch)
treebe0f7ea68e8ef6063cb111c71f5e8fcaed3d0838 /pango/pangofc-shape.c
parentccfd3b466ca43b202681ce951600aac8f97d8dc4 (diff)
downloadpango-ad92e199f221499c19f22dce7a16e7d770ad3ae7.tar.gz
Fix crash in pango_fc_font_key_get_variations() when key is null
Diffstat (limited to 'pango/pangofc-shape.c')
-rw-r--r--pango/pangofc-shape.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/pango/pangofc-shape.c b/pango/pangofc-shape.c
index a59ca67c..53269d73 100644
--- a/pango/pangofc-shape.c
+++ b/pango/pangofc-shape.c
@@ -380,8 +380,10 @@ _pango_fc_shape (PangoFont *font,
fc_font->is_hinted ? ft_face->size->metrics.x_ppem : 0,
fc_font->is_hinted ? ft_face->size->metrics.y_ppem : 0);
- variations = pango_fc_font_key_get_variations (key);
- if (variations)
+ if (key)
+ {
+ variations = pango_fc_font_key_get_variations (key);
+ if (variations)
{
guint n_variations;
hb_variation_t *hb_variations;
@@ -391,6 +393,7 @@ _pango_fc_shape (PangoFont *font,
g_free (hb_variations);
}
+ }
hb_buffer = acquire_buffer (&free_buffer);