[Emacs-diffs] /srv/bzr/emacs/trunk r106345: xdisp.c (fill_composite_glyph_string): Always set s->face, to avoid a crash (bug#9496).

[Kenichi Handa]

------------------------------------------------------------
revno: 106345 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Fri 2011-11-11 16:09:14 +0900
message:
  xdisp.c (fill_composite_glyph_string): Always set s->face, to avoid a crash 
(bug#9496).
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-09 14:29:23 +0000
+++ b/src/ChangeLog     2011-11-11 07:08:47 +0000
@@ -1,3 +1,8 @@
+2011-11-11  Johan Bockgård  <address@hidden>
+
+       * xdisp.c (fill_composite_glyph_string): Always set s->face, to
+       avoid a crash (bug#9496).
+
 2011-11-09  Chong Yidong  <address@hidden>
 
        * window.c (Fwindow_inside_edges, Fwindow_inside_pixel_edges)

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-11-08 20:05:27 +0000
+++ b/src/xdisp.c       2011-11-11 07:08:47 +0000
@@ -22121,6 +22121,12 @@
     }
   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;