diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-09-02 01:20:47 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-09-02 01:20:47 +0000 |
| commit | 2dcf2b726516c13301546447175ca19a9991d910 (patch) | |
| tree | 54afaca0ba60301f55653bb60b2434894145a608 | |
| parent | c1ae75e06b176a73f2d7da46b0923fc8cb22d60b (diff) | |
| parent | 21a0ba66b1e670b8ce858ae285384f69345508af (diff) | |
| download | pango-2dcf2b726516c13301546447175ca19a9991d910.tar.gz | |
Merge branch 'matthiasc/for-main' into 'main'
Avoid a crash
See merge request GNOME/pango!469
| -rw-r--r-- | pango/itemize.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pango/itemize.c b/pango/itemize.c index 29a1cdff..bd339633 100644 --- a/pango/itemize.c +++ b/pango/itemize.c @@ -1056,15 +1056,21 @@ collect_font_scale (PangoContext *context, entry->attr = attr; *stack = g_list_prepend (*stack, entry); - hb_font = pango_font_get_hb_font (prev->analysis.font); - hb_font_get_scale (hb_font, NULL, &y_scale); + if (prev) + { + hb_font = pango_font_get_hb_font (prev->analysis.font); + hb_font_get_scale (hb_font, NULL, &y_scale); + } + else + hb_font = NULL; switch (((PangoAttrInt *)attr)->value) { case PANGO_FONT_SCALE_NONE: break; case PANGO_FONT_SCALE_SUPERSCRIPT: - if (hb_ot_metrics_get_position (hb_font, + if (hb_font && + hb_ot_metrics_get_position (hb_font, HB_OT_METRICS_TAG_SUPERSCRIPT_EM_Y_SIZE, &y_size)) entry->scale = y_size / (double) y_scale; @@ -1072,7 +1078,8 @@ collect_font_scale (PangoContext *context, entry->scale = 1 / 1.2; break; case PANGO_FONT_SCALE_SUBSCRIPT: - if (hb_ot_metrics_get_position (hb_font, + if (hb_font && + hb_ot_metrics_get_position (hb_font, HB_OT_METRICS_TAG_SUBSCRIPT_EM_Y_SIZE, &y_size)) entry->scale = y_size / (double) y_scale; @@ -1139,7 +1146,7 @@ static void apply_font_scale (PangoContext *context, GList *items) { - PangoItem *prev; + PangoItem *prev = NULL; GList *stack = NULL; for (GList *l = items; l; l = l->next) |