--- s_inter.c.orig	2006-09-19 11:44:05.000000000 -0400
+++ s_inter.c	2006-09-19 16:44:21.000000000 -0400
@@ -844,7 +844,8 @@
 
 #define FIRSTPORTNUM 5400
 
-static int defaultfontshit[] = {
+#define MAXFONTS 21
+static int defaultfontshit[MAXFONTS] = {
     8, 5, 9, 10, 6, 10, 12, 7, 13, 14, 9, 17, 16, 10, 19, 24, 15, 28,
         24, 15, 28};
 
@@ -894,7 +895,7 @@
     {
             /* fake the GUI's message giving cwd and font sizes; then
             skip starting the GUI up. */
-        t_atom zz[19];
+        t_atom zz[MAXFONTS+2];
         int i;
 #ifdef _WIN32
         if (GetCurrentDirectory(MAXPDSTRING, cmdbuf) == 0)
@@ -906,10 +907,10 @@
         
 #endif
         SETSYMBOL(zz, gensym(cmdbuf));
-        for (i = 1; i < 22; i++)
-            SETFLOAT(zz + i, defaultfontshit[i-1]);
-        SETFLOAT(zz+22,0);
-        glob_initfromgui(0, 0, 23, zz);
+        for (i = 0; i < MAXFONTS; i++)
+            SETFLOAT(zz+i+1, defaultfontshit[i]);
+        SETFLOAT(zz+i+1,0);
+        glob_initfromgui(0, 0, MAXFONTS+2, zz);
     }
     else if (sys_guisetportnumber)  /* GUI exists and sent us a port number */
     {