(Ffont_spec): Check arguments.

cccd42d5 · Kenichi Handa · 337fbd17 · cccd42d5 · cccd42d5
Commit cccd42d5 authored May 15, 2009 by Kenichi Handa
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

src/ChangeLog src/ChangeLog +4 -0

src/font.c src/font.c +6 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2009-05-15  Kenichi Handa  <handa@m17n.org>
+
+	* font.c (Ffont_spec): Check arguments.
+
 2009-05-14  Chong Yidong  <cyd@stupidchicken.com>

 	* xfaces.c (tty_supports_face_attributes_p): Recognize unspecified

--- a/src/font.c
+++ b/src/font.c
@@ -4007,7 +4007,12 @@ usage: (font-spec ARGS...)  */)

  for (i = 0; i < nargs; i += 2)
    {
-      Lisp_Object key = args[i], val = args[i + 1];
+      Lisp_Object key = args[i], val;
+
+      CHECK_SYMBOL (key);
+      if (i + 1 >= nargs)
+	error ("No value for key `%s'", SDATA (SYMBOL_NAME (key)));
+      val = args[i + 1];

      if (EQ (key, QCname))
 	{