diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-03-06 12:37:46 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-03-06 12:37:46 +0400 |
| commit | 2eb980f614ab59aa8f632ae5a70f719f34e8410f (patch) | |
| tree | 65909c2b09d57526e6b354c3284b52594ae68f6b | |
| parent | f3b4b1688314caa6f3dc32ef6aa796642c408d1f (diff) | |
| download | php-git-2eb980f614ab59aa8f632ae5a70f719f34e8410f.tar.gz | |
IS_REFERENCE with refcount==1 should be handled as ordinal value
| -rw-r--r-- | Zend/zend_variables.c | 7 | ||||
| -rw-r--r-- | ext/standard/var.c | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index 7fd42b2eaf..47b07eec79 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -188,7 +188,12 @@ ZEND_API void _zval_internal_dtor_for_ptr(zval *zvalue ZEND_FILE_LINE_DC) ZEND_API void zval_add_ref(zval *p) { if (Z_REFCOUNTED_P(p)) { - Z_ADDREF_P(p); +//???: autoconversion from reverence to ordinal value + if (Z_ISREF_P(p) && Z_REFCOUNT_P(p) == 1) { + ZVAL_DUP(p, Z_REFVAL_P(p)); + } else { + Z_ADDREF_P(p); + } } } diff --git a/ext/standard/var.c b/ext/standard/var.c index c84c6515f0..2cd214d86a 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -97,7 +97,10 @@ PHPAPI void php_var_dump(zval *struc, int level TSRMLS_DC) /* {{{ */ } if (Z_TYPE_P(struc) == IS_REFERENCE) { - is_ref = 1; +//??? hide references with refcount==1 (for compatibility) + if (Z_REFCOUNT_P(struc) > 1) { + is_ref = 1; + } struc = Z_REFVAL_P(struc); } @@ -256,7 +259,10 @@ PHPAPI void php_debug_zval_dump(zval *struc, int level TSRMLS_DC) /* {{{ */ } if (Z_TYPE_P(struc) == IS_REFERENCE) { - is_ref = 1; +//??? hide references with refcount==1 (for compatibility) + if (Z_REFCOUNT_P(struc) > 1) { + is_ref = 1; + } struc = Z_REFVAL_P(struc); } |