summaryrefslogtreecommitdiffstats
path: root/office/texlive/branch2011/10-luatex_array_fix_from_r24353.patch
blob: d2fadb9d109f77df71a16fd91909a79cadbf9d14 (plain)
r24363 | karl | 2011-10-22 23:08:32 +0000 (Sat, 22 Oct 2011) | 1 line

branch2011: import luatex array fix from trunk r24353

Index: Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/psread.c
===================================================================
--- Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/psread.c	(revision 24362)
+++ Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/psread.c	(revision 24363)
@@ -385,7 +385,7 @@
     wrapper->top = io;
 }
 
-static int ioescapestopped(IO *wrapper, struct psstack *stack, int sp) {
+static int ioescapestopped(IO *wrapper, struct psstack *stack, int sp, const size_t bsize) {
     _IO *io = wrapper->top, *iop;
     int wasstopped;
 
@@ -396,7 +396,7 @@
 	free(io);
 	if ( wasstopped ) {
 	    wrapper->top = iop;
-	    if ( sp<(int)(sizeof(stack)/sizeof(stack[0])) ) {
+	    if ( sp<(int)bsize ) {
 		stack[sp].type = ps_bool;
 		stack[sp++].u.tf = true;
 	    }
@@ -1609,7 +1609,7 @@
 	    }
 	  break;
 	  case pt_stop:
-	    sp = ioescapestopped(wrapper,stack,sp);
+	    sp = ioescapestopped(wrapper,stack,sp,sizeof(stack)/sizeof(stack[0]));
 	  break;
 	  case pt_load:
 	    if ( sp>=1 && stack[sp-1].type==ps_lit ) {