- Should fix the pass by reference problem. This happened because we moved

Andi Gutmans · Andi Gutmans · commit 3d631c4ca07a · 1999-04-15T17:41:21.000Z
start from arg 1 now and not arg 0. There might be more places which need fixing
 like in the executor but the bug seems OK now.
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -657,15 +657,15 @@ void do_receive_arg(int op, znode *var, znode *offset, znode *initialization, un
 	if (pass_type==BYREF_FORCE && !CG(active_op_array)->arg_types) {
 		int i;
 
-		CG(active_op_array)->arg_types = (unsigned char *) emalloc(sizeof(unsigned char)*(offset->u.constant.value.lval+2));
-		for (i=1; i<=offset->u.constant.value.lval; i++) {
+		CG(active_op_array)->arg_types = (unsigned char *) emalloc(sizeof(unsigned char)*(offset->u.constant.value.lval+1));
+		for (i=1; i<offset->u.constant.value.lval; i++) {
 			CG(active_op_array)->arg_types[i] = BYREF_NONE;
 		}
 		CG(active_op_array)->arg_types[0]=(unsigned char) offset->u.constant.value.lval;
 	}
 	if (CG(active_op_array)->arg_types) {
-		CG(active_op_array)->arg_types = (unsigned char *) erealloc(CG(active_op_array)->arg_types, sizeof(unsigned char)*(offset->u.constant.value.lval+2));
-		CG(active_op_array)->arg_types[offset->u.constant.value.lval+1] = pass_type;
+		CG(active_op_array)->arg_types = (unsigned char *) erealloc(CG(active_op_array)->arg_types, sizeof(unsigned char)*(offset->u.constant.value.lval+1));
+		CG(active_op_array)->arg_types[offset->u.constant.value.lval] = pass_type;
 		CG(active_op_array)->arg_types[0]++;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -657,15 +657,15 @@ void do_receive_arg(int op, znode var, znode offset, znode *initialization, un`
`657`	`657`	`if (pass_type==BYREF_FORCE && !CG(active_op_array)->arg_types) {`
`658`	`658`	`int i;`
`659`	`659`
`660`		`- CG(active_op_array)->arg_types = (unsigned char ) emalloc(sizeof(unsigned char)(offset->u.constant.value.lval+2));`
`661`		`- for (i=1; i<=offset->u.constant.value.lval; i++) {`
	`660`	`+ CG(active_op_array)->arg_types = (unsigned char ) emalloc(sizeof(unsigned char)(offset->u.constant.value.lval+1));`
	`661`	`+ for (i=1; i<offset->u.constant.value.lval; i++) {`
`662`	`662`	`CG(active_op_array)->arg_types[i] = BYREF_NONE;`
`663`	`663`	`}`
`664`	`664`	`CG(active_op_array)->arg_types[0]=(unsigned char) offset->u.constant.value.lval;`
`665`	`665`	`}`
`666`	`666`	`if (CG(active_op_array)->arg_types) {`
`667`		`- CG(active_op_array)->arg_types = (unsigned char ) erealloc(CG(active_op_array)->arg_types, sizeof(unsigned char)(offset->u.constant.value.lval+2));`
`668`		`- CG(active_op_array)->arg_types[offset->u.constant.value.lval+1] = pass_type;`
	`667`	`+ CG(active_op_array)->arg_types = (unsigned char ) erealloc(CG(active_op_array)->arg_types, sizeof(unsigned char)(offset->u.constant.value.lval+1));`
	`668`	`+ CG(active_op_array)->arg_types[offset->u.constant.value.lval] = pass_type;`
`669`	`669`	`CG(active_op_array)->arg_types[0]++;`
`670`	`670`	`}`
`671`	`671`	`}`