com php-src: Fix by-reference argument unpacking: Zend/zend_v m_def.h Zend/zend_vm_execute.h
| From: | Dmitry Stogov | Date: | Sat, 26 Apr 2014 08:40:12 +0000 |
| Subject: | com php-src: Fix by-reference argument unpacking: Zend/zend_v m_def.h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77270@lists.php.net to get a copy of this message | ||
Commit: 4cd97b3ebd89217094fad0ecabcc281cd35f8864
Author: Nikita Popov <nikic@php.net> Sat, 26 Apr 2014 10:40:12 +0200
Parents: 5db9312ec8653b2d26f60094ee994b6586e89d54
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4cd97b3ebd89217094fad0ecabcc281cd35f8864
Log:
Fix by-reference argument unpacking
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index d2db9e0..1cfd765 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3150,7 +3150,7 @@ ZEND_VM_C_LABEL(send_again):
switch (Z_TYPE_P(args)) {
case IS_ARRAY: {
HashTable *ht = Z_ARRVAL_P(args);
- zval *arg;
+ zval *arg, *top;
zend_string *name;
ZEND_VM_STACK_GROW_IF_NEEDED(zend_hash_num_elements(ht));
@@ -3163,16 +3163,17 @@ ZEND_VM_C_LABEL(send_again):
ZEND_VM_NEXT_OPCODE();
}
+ top = zend_vm_stack_top_inc(TSRMLS_C);
if (ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(arg);
Z_ADDREF_P(arg);
+ ZVAL_COPY_VALUE(top, arg);
} else if (Z_ISREF_P(arg)) {
- ZVAL_DUP(arg, Z_REFVAL_P(arg));
+ ZVAL_DUP(top, Z_REFVAL_P(arg));
} else {
- if (Z_REFCOUNTED_P(arg)) Z_ADDREF_P(arg);
+ ZVAL_COPY(top, arg);
}
- zend_vm_stack_push(arg TSRMLS_CC);
EX(call)->num_additional_args++;
arg_num++;
} ZEND_HASH_FOREACH_END();
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 33850c8..4e10970 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -750,7 +750,7 @@ send_again:
switch (Z_TYPE_P(args)) {
case IS_ARRAY: {
HashTable *ht = Z_ARRVAL_P(args);
- zval *arg;
+ zval *arg, *top;
zend_string *name;
ZEND_VM_STACK_GROW_IF_NEEDED(zend_hash_num_elements(ht));
@@ -763,16 +763,17 @@ send_again:
ZEND_VM_NEXT_OPCODE();
}
+ top = zend_vm_stack_top_inc(TSRMLS_C);
if (ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(arg);
Z_ADDREF_P(arg);
+ ZVAL_COPY_VALUE(top, arg);
} else if (Z_ISREF_P(arg)) {
- ZVAL_DUP(arg, Z_REFVAL_P(arg));
+ ZVAL_DUP(top, Z_REFVAL_P(arg));
} else {
- if (Z_REFCOUNTED_P(arg)) Z_ADDREF_P(arg);
+ ZVAL_COPY(top, arg);
}
- zend_vm_stack_push(arg TSRMLS_CC);
EX(call)->num_additional_args++;
arg_num++;
} ZEND_HASH_FOREACH_END();