From: Kenichi Handa <handa@m17n.org>
Date: Thu, 23 Oct 2003 08:42:39 +0000 (+0000)
Subject: (Fnew_fontset): Check NAME more rigidly.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1745
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=df1e3c952e5f9124b3f709352a57679c471273b4;p=emacs.git

(Fnew_fontset): Check NAME more rigidly.
---

diff --git a/src/fontset.c b/src/fontset.c
index 82628c2585c..51938488680 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1378,7 +1378,7 @@ FONT-SPEC is a vector, a cons, or a string.  See the documentation of
     {
       name = Fdowncase (name);
       val = split_font_name_into_vector (name);
-      if (NILP (val))
+      if (NILP (val) || NILP (AREF (val, 12)) || NILP (AREF (val, 13)))
 	error ("Fontset name must be in XLFD format");
       if (strcmp (SDATA (AREF (val, 12)), "fontset"))
 	error ("Registry field of fontset name must be \"fontset\"");