(Ffontset_info): Check that face is non-null

before accessing its fields.

diff --git a/src/ChangeLog b/src/ChangeLog
index cafe4b22ac1269e25c1a24a0d872266d9721a795..7c3d7b660a66f559f7ed40454de119c58516d6ab 100644 (file)
--- 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 00ae161baa2b07c24e18b6510ad61ab9c49acc97..5e359ddef8f4dec456fb8e0c840facffb767d4c8 100644 (file)
--- 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)))))