diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-03-05 15:34:50 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-03-05 15:34:50 +0400 |
| commit | 50d899dda3d225c962fec1b8cce1cb880c84999e (patch) | |
| tree | 40e0d4c71bf8d1070f4e0561d36920f9f571fff5 /Zend/zend_API.h | |
| parent | b763baff97b85cead7b6a3cbf904826fb9bb8d16 (diff) | |
| parent | ef01b7937e334ab454a1ea9b1704d6f981bef801 (diff) | |
| download | php-git-50d899dda3d225c962fec1b8cce1cb880c84999e.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'Zend/zend_API.h')
| -rw-r--r-- | Zend/zend_API.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index d3817ab307..da401fe951 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -677,18 +677,18 @@ END_EXTERN_C() \ if ((orig_var = zend_hash_str_find(symtable, (name), (name_length))) != NULL \ && Z_ISREF_P(orig_var)) { \ - Z_SET_REFCOUNT_P(var, Z_REFCOUNT_P(orig_var)); \ - /*???Z_SET_ISREF_P(var);*/ \ - \ - if (_refcount) { \ - Z_SET_REFCOUNT_P(var, Z_REFCOUNT_P(var) + _refcount - 1); \ + if (Z_REFCOUNTED_P(var)) { \ + Z_SET_REFCOUNT_P(var, Z_REFCOUNT_P(orig_var)); \ + if (_refcount) { \ + Z_SET_REFCOUNT_P(var, Z_REFCOUNT_P(var) + _refcount - 1); \ + } \ } \ zval_dtor(orig_var); \ ZVAL_COPY_VALUE(orig_var, var); \ /*???FREE_ZVAL(var);*/ \ } else { \ /*???Z_SET_ISREF_TO_P(var, _is_ref);*/ \ - if (_refcount) { \ + if (_refcount && Z_REFCOUNTED_P(var)) { \ Z_SET_REFCOUNT_P(var, _refcount); \ } \ zend_hash_str_update(symtable, (name), (name_length), var); \ |