(Ffont_spec): Check arguments.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/font.c b/src/font.c
index cdff0d678e6..19bc70dd976 100644
--- 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))
         {