com php-src: Fixed missed REFCOUNTED checking: Zend/zend_exec ute_API.c
| From: | Dmitry Stogov | Date: | Fri, 21 Feb 2014 14:39:27 +0000 |
| Subject: | com php-src: Fixed missed REFCOUNTED checking: Zend/zend_exec ute_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78016@lists.php.net to get a copy of this message | ||
Commit: 76c28f878ae37975b5520aaedf4b8f2986fe540b
Author: Xinchen Hui <laruence@gmail.com> Fri, 21 Feb 2014 22:39:27 +0800
Parents: b96318105b8a908ec3cb294b8133e36d1b8cba7a
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=76c28f878ae37975b5520aaedf4b8f2986fe540b
Log:
Fixed missed REFCOUNTED checking
Changed paths:
M Zend/zend_execute_API.c
Diff:
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index dc194d0..e0dede1 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -831,31 +831,33 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache
TS
zval *param;
if (ARG_SHOULD_BE_SENT_BY_REF(EX(function_state).function, i + 1)) {
- if (!Z_ISREF(fci->params[i]) && Z_REFCOUNT(fci->params[i]) > 1) {
- zval new_zval;
-
- if (fci->no_separation &&
- !ARG_MAY_BE_SENT_BY_REF(EX(function_state).function, i + 1)) {
- if (i || UNEXPECTED(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) ==
(EG(argument_stack)->top))) {
- /* hack to clean up the stack */
- ZVAL_LONG(&tmp, i);
- zend_vm_stack_push(&tmp TSRMLS_CC);
- zend_vm_stack_clear_multiple(0 TSRMLS_CC);
+ if (Z_REFCOUNTED(fci->params[i])) {
+ if (!Z_ISREF(fci->params[i]) && Z_REFCOUNT(fci->params[i]) > 1) {
+ zval new_zval;
+
+ if (fci->no_separation &&
+ !ARG_MAY_BE_SENT_BY_REF(EX(function_state).function, i + 1)) {
+ if (i || UNEXPECTED(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) ==
(EG(argument_stack)->top))) {
+ /* hack to clean up the stack */
+ ZVAL_LONG(&tmp, i);
+ zend_vm_stack_push(&tmp TSRMLS_CC);
+ zend_vm_stack_clear_multiple(0 TSRMLS_CC);
+ }
+
+ zend_error(E_WARNING, "Parameter %d to %s%s%s() expected to be a reference, value
given",
+ i+1,
+ EX(function_state).function->common.scope ?
EX(function_state).function->common.scope->name->val : "",
+ EX(function_state).function->common.scope ? "::" : "",
+ EX(function_state).function->common.function_name->val);
+ return FAILURE;
}
- zend_error(E_WARNING, "Parameter %d to %s%s%s() expected to be a reference, value
given",
- i+1,
- EX(function_state).function->common.scope ?
EX(function_state).function->common.scope->name->val : "",
- EX(function_state).function->common.scope ? "::" : "",
- EX(function_state).function->common.function_name->val);
- return FAILURE;
+ ZVAL_DUP(&new_zval, &fci->params[i]);
+ Z_DELREF(fci->params[i]);
+ ZVAL_COPY_VALUE(&fci->params[i], &new_zval);
}
-
- ZVAL_DUP(&new_zval, &fci->params[i]);
- Z_DELREF(fci->params[i]);
- ZVAL_COPY_VALUE(&fci->params[i], &new_zval);
+ Z_ADDREF(fci->params[i]);
}
- Z_ADDREF(fci->params[i]);
//??? Z_SET_ISREF_PP(fci->params[i]);
param = &fci->params[i];
} else if (Z_ISREF(fci->params[i]) &&