[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100637: Avoid crash on composition (backport from trunk).

[Chong Yidong]

------------------------------------------------------------
revno: 100637
author: Johan Bockgård <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Mon 2012-01-09 17:44:18 +0800
message:
  Avoid crash on composition (backport from trunk).
  
  * 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     2012-01-09 09:35:21 +0000
+++ b/src/ChangeLog     2012-01-09 09:44:18 +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).
+
 2012-01-09  Chong Yidong  <address@hidden>
 
        * xdisp.c (note_mouse_highlight): Fix use of uninitialized var.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-01-09 09:40:11 +0000
+++ b/src/xdisp.c       2012-01-09 09:44:18 +0000
@@ -19635,6 +19635,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;