[Emacs-diffs] trunk r116492: Fix bug #16819 with dereferencing invalid face pointer.

[Eli Zaretskii]

------------------------------------------------------------
revno: 116492
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16819
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2014-02-20 19:13:55 +0200
message:
  Fix bug #16819 with dereferencing invalid face pointer.
  
   src/xdisp.c (init_iterator): Don't dereference a bogus face
   pointer.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-02-20 07:38:47 +0000
+++ b/src/ChangeLog     2014-02-20 17:13:55 +0000
@@ -1,3 +1,8 @@
+2014-02-20  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (init_iterator): Don't dereference a bogus face
+       pointer.  (Bug#16819)
+
 2014-02-20  Glenn Morris  <address@hidden>
 
        * data.c (Fdefalias): Doc fix.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2014-02-19 17:32:29 +0000
+++ b/src/xdisp.c       2014-02-20 17:13:55 +0000
@@ -2928,7 +2928,7 @@
       /* If we have a boxed mode line, make the first character appear
         with a left box line.  */
       face = FACE_FROM_ID (it->f, remapped_base_face_id);
-      if (face->box != FACE_NO_BOX)
+      if (face && face->box != FACE_NO_BOX)
        it->start_of_box_run_p = true;
     }