(font_parse_xlfd): Handle patterns of length < 2.

e3928081 · Chong Yidong · 289e7f8f · e3928081
Commit e3928081 authored Jan 24, 2009 by Chong Yidong
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

src/font.c src/font.c +2 -2

No files found.
--- a/src/font.c
+++ b/src/font.c
@@ -1066,11 +1066,11 @@ font_parse_xlfd (name, font)
  Lisp_Object val;
  char *p;

-  if (len > 255)
+  if (len > 255 || !len)
    /* Maximum XLFD name length is 255. */
    return -1;
  /* Accept "*-.." as a fully specified XLFD. */
-  if (name[0] == '*' && name[1] == '-')
+  if (name[0] == '*' && (len == 1 || name[1] == '-'))
    i = 1, f[XLFD_FOUNDRY_INDEX] = name;
  else
    i = 0;