[Emacs-diffs] Changes to emacs/src/fontset.c,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/05/15 00:41:27

Index: fontset.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fontset.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- fontset.c   14 May 2008 07:49:30 -0000      1.118
+++ fontset.c   15 May 2008 00:41:26 -0000      1.119
@@ -1557,7 +1557,7 @@
     {
       Lisp_Object font_spec = Ffont_spec (0, NULL);
       Lisp_Object short_name;
-      char *xlfd;
+      char xlfd[256];
       int len;
 
       if (font_parse_xlfd (SDATA (name), font_spec) < 0)
@@ -1570,8 +1570,9 @@
                                    Vfontset_alias_alist);
       ASET (font_spec, FONT_REGISTRY_INDEX, Qiso8859_1);
       fontset = make_fontset (Qnil, name, Qnil);
-      xlfd = alloca (SBYTES (name) + 1);
-      len = font_unparse_xlfd (font_spec, 0, xlfd, SBYTES (name) + 1);
+      len = font_unparse_xlfd (font_spec, 0, xlfd, 256);
+      if (len < 0)
+       error ("Invalid fontset name (perhaps too long): %s", SDATA (name));
       FONTSET_ASCII (fontset) = make_unibyte_string (xlfd, len);
     }
   else