Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv848/src
Modified Files: Tag: devel_0_39 s_inter.c Log Message: fixed array overflow
Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.10.2.14 retrieving revision 1.5.4.10.2.15 diff -C2 -d -r1.5.4.10.2.14 -r1.5.4.10.2.15 *** s_inter.c 20 Apr 2006 10:33:26 -0000 1.5.4.10.2.14 --- s_inter.c 20 Apr 2006 16:39:47 -0000 1.5.4.10.2.15 *************** *** 880,884 **** #define FIRSTPORTNUM 5400
! static int defaultfontshit[] = { 8, 5, 9, 10, 6, 10, 12, 7, 13, 14, 9, 17, 16, 10, 19, 24, 15, 28, 24, 15, 28}; --- 880,885 ---- #define FIRSTPORTNUM 5400
! #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}; *************** *** 891,895 **** skip starting the GUI up. */ char cmdbuf[4*MAXPDSTRING]; ! t_atom zz[19]; int i; #ifdef MSW --- 892,896 ---- skip starting the GUI up. */ char cmdbuf[4*MAXPDSTRING]; ! t_atom zz[MAXFONTS+2]; int i; #ifdef MSW *************** *** 903,910 **** #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); return 0; } --- 904,911 ---- #endif SETSYMBOL(zz, gensym(cmdbuf)); ! for (i = 0; i < MAXFONTS; i++) ! SETFLOAT(zz+i+1, defaultfontshit[i]); ! SETFLOAT(zz+i+1,0); ! glob_initfromgui(0, 0, MAXFONTS+2, zz); return 0; }