Fix argument unpacking

nikic · nikic · commit 2c6ee5dcb57a · 2014-04-11T19:53:14.000+02:00
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -1690,6 +1690,7 @@ static zval *zend_vm_stack_push_args_with_copy(int count TSRMLS_DC) /* {{{ */
 	ZVAL_LONG(EG(argument_stack)->top, count);
 	while (count-- > 0) {
 		zval *data = --p->top;
+		ZVAL_COPY_VALUE(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) + count, data);
 
 		if (UNEXPECTED(p->top == ZEND_VM_STACK_ELEMETS(p))) {
 			zend_vm_stack r = p;
@@ -1698,7 +1699,6 @@ static zval *zend_vm_stack_push_args_with_copy(int count TSRMLS_DC) /* {{{ */
 			p = p->prev;
 			efree(r);
 		}
-		ZVAL_COPY_VALUE(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) + count, data);
 	}
 	return EG(argument_stack)->top++;
 }

Original file line number	Diff line number	Diff line change
`@@ -1690,6 +1690,7 @@ static zval zend_vm_stack_push_args_with_copy(int count TSRMLS_DC) / {{{ */`
`1690`	`1690`	`ZVAL_LONG(EG(argument_stack)->top, count);`
`1691`	`1691`	`while (count-- > 0) {`
`1692`	`1692`	`zval *data = --p->top;`
	`1693`	`+ ZVAL_COPY_VALUE(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) + count, data);`
`1693`	`1694`
`1694`	`1695`	`if (UNEXPECTED(p->top == ZEND_VM_STACK_ELEMETS(p))) {`
`1695`	`1696`	`zend_vm_stack r = p;`
`@@ -1698,7 +1699,6 @@ static zval zend_vm_stack_push_args_with_copy(int count TSRMLS_DC) / {{{ */`
`1698`	`1699`	`p = p->prev;`
`1699`	`1700`	`efree(r);`
`1700`	`1701`	`}`
`1701`		`- ZVAL_COPY_VALUE(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) + count, data);`
`1702`	`1702`	`}`
`1703`	`1703`	`return EG(argument_stack)->top++;`
`1704`	`1704`	`}`