summaryrefslogtreecommitdiff
path: root/Zend/zend_execute_API.c
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2015-07-07 19:21:02 +0800
committerXinchen Hui <laruence@php.net>2015-07-07 19:21:02 +0800
commit7af4e6d02d678b9e31c192e8adfc3bb9d6277f5a (patch)
treed5161b01fef6cb077a6adbb98095140fd1775a48 /Zend/zend_execute_API.c
parent333528089e053b1db35a073955b3ec7244881667 (diff)
downloadphp-git-7af4e6d02d678b9e31c192e8adfc3bb9d6277f5a.tar.gz
Fixed bug #70006 (cli - function with default arg = STDOUT crash output).
Diffstat (limited to 'Zend/zend_execute_API.c')
-rw-r--r--Zend/zend_execute_API.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index fc92494a1d..29d06731e5 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -555,11 +555,9 @@ ZEND_API int zval_update_constant_ex(zval *p, zend_bool inline_change, zend_clas
zend_throw_error(zend_ce_error, "Cannot declare self-referencing constant '%s'", Z_STRVAL_P(p));
return FAILURE;
} else if (Z_TYPE_P(p) == IS_CONSTANT) {
- int refcount;
SEPARATE_ZVAL_NOREF(p);
MARK_CONSTANT_VISITED(p);
- refcount = Z_REFCOUNTED_P(p) ? Z_REFCOUNT_P(p) : 1;
if (Z_CONST_FLAGS_P(p) & IS_CONSTANT_CLASS) {
ZEND_ASSERT(EG(current_execute_data));
if (inline_change) {
@@ -639,8 +637,6 @@ ZEND_API int zval_update_constant_ex(zval *p, zend_bool inline_change, zend_clas
}
zval_opt_copy_ctor(p);
}
-
- if (Z_REFCOUNTED_P(p)) Z_SET_REFCOUNT_P(p, refcount);
} else if (Z_TYPE_P(p) == IS_CONSTANT_AST) {
zval tmp;