diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-02-26 12:52:43 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-02-26 12:52:43 +0800 |
| commit | 66b7f6722d16a261243390ed2afdc97de15b5f93 (patch) | |
| tree | d59b5611b79c442e471094e9c3e2951965a4d397 /Zend/zend_execute_API.c | |
| parent | 80a178015d6b162ff0ba7a8e8f5a08c88829cc3c (diff) | |
| parent | 4a1ecf0e8b04363901c92aea55a203fc73a24b95 (diff) | |
| download | php-git-66b7f6722d16a261243390ed2afdc97de15b5f93.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 863130bf29..c8679625c1 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -623,7 +623,7 @@ ZEND_API int zval_update_constant_ex(zval *p, void *arg, zend_class_entry *scope } } - if (Z_REFCOUNT_P(element) > 1) { + if (Z_REFCOUNTED_P(element) && Z_REFCOUNT_P(element) > 1) { ZVAL_DUP(&new_val, element); /* preserve this bit for inheritance */ |