From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 16 May 2001 10:18:36 +0000 (+0000)
Subject: (Ffontset_info): Check that face is non-null
X-Git-Tag: emacs-pretest-21.0.104~493
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dbcf3c03cabd113eb15cef810206cf3a6a3d45dd;p=emacs.git

(Ffontset_info): Check that face is non-null
before accessing its fields.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index cafe4b22ac1..7c3d7b660a6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-16  Gerd Moellmann  <gerd@gnu.org>
+
+	* fontset.c (Ffontset_info): Check that face is non-null
+	before accessing its fields.
+
 2001-05-15  Gerd Moellmann  <gerd@gnu.org>
 
 	* keyboard.c (read_key_sequence): Prevent generating a fake
diff --git a/src/fontset.c b/src/fontset.c
index 00ae161baa2..5e359ddef8f 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1319,7 +1319,7 @@ If FRAME is omitted, it defaults to the currently selected frame.")
 	  if (INTEGERP (face_id))
 	    {
 	      face = FACE_FROM_ID (f, XINT (face_id));
-	      if (face->font && face->font_name)
+	      if (face && face->font && face->font_name)
 		{
 		  font = build_string (face->font_name);
 		  if (NILP (Fmember (font, XCDR (XCDR (elt)))))