xdisp.c (fill_composite_glyph_string): Always set s->face, to avoid a crash (bug#9496).

2 files changed, 11 insertions, 0 deletions

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  <bojohan@gnu.org>
+
+	* xdisp.c (fill_composite_glyph_string): Always set s->face, to
+	avoid a crash (bug#9496).
+
 2011-11-07  Kenichi Handa  <handa@m17n.org>
 
 	* 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;