com php-src: Fix argument unpacking: Zend/zend_execute.c
| From: | Dmitry Stogov | Date: | Fri, 11 Apr 2014 17:53:14 +0000 |
| Subject: | com php-src: Fix argument unpacking: Zend/zend_execute.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77420@lists.php.net to get a copy of this message | ||
Commit: 2c6ee5dcb57ab38a85c842f83b2b8298bc687224
Author: Nikita Popov <nikic@php.net> Fri, 11 Apr 2014 19:53:14 +0200
Parents: e27eca90a58bdf90e33cd13290e4b2208a62bf7c
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2c6ee5dcb57ab38a85c842f83b2b8298bc687224
Log:
Fix argument unpacking
Changed paths:
M Zend/zend_execute.c
Diff:
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index e409008..1fb209a 100644
--- 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++;
}