From 9ac0394b8d1e54bf1b49291c85770af36a94531e Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Fri, 11 Nov 2011 16:08:10 +0900 Subject: [PATCH] xdisp.c (fill_composite_glyph_string): Always set s->face, to avoid a crash (bug#9496). --- src/ChangeLog | 5 +++++ src/xdisp.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 4058054ec02..b09dae946f4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-11-11 Johan Bockgård + + * xdisp.c (fill_composite_glyph_string): Always set s->face, to + avoid a crash (bug#9496). + 2011-11-07 Kenichi Handa * coding.c (coding_set_destination): Check coding->src_pos only diff --git a/src/xdisp.c b/src/xdisp.c index 197fb748598..9bb2396c4a3 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -22121,6 +22121,12 @@ fill_composite_glyph_string (struct glyph_string *s, struct face *base_face, } s->cmp_to = i; + if (s->face == NULL) + { + s->face = base_face->ascii_face; + s->font = s->face->font; + } + /* All glyph strings for the same composition has the same width, i.e. the width set for the first component of the composition. */ s->width = s->first_glyph->pixel_width; -- 2.39.2