From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 20 Feb 2014 17:13:55 +0000 (+0200)
Subject: Fix bug #16819 with dereferencing invalid face pointer.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=44a2be2d6602c4fd4b8bf178eb82baaf4f686208;p=emacs.git

Fix bug #16819 with dereferencing invalid face pointer.

 src/xdisp.c (init_iterator): Don't dereference a bogus face
 pointer.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c127e793668..b46650a76db 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-20  Eli Zaretskii  <eliz@gnu.org>
+
+	* xdisp.c (init_iterator): Don't dereference a bogus face
+	pointer.  (Bug#16819)
+
 2014-02-20  Glenn Morris  <rgm@gnu.org>
 
 	* data.c (Fdefalias): Doc fix.
diff --git a/src/xdisp.c b/src/xdisp.c
index b9908c6c9c6..6d5b9d18260 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2928,7 +2928,7 @@ init_iterator (struct it *it, struct window *w,
       /* 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;
     }