diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-26 09:04:07 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-26 09:04:25 +0000 |
| commit | 2d339fa4d1e82c888e4f514a741eb7ac14055671 (patch) | |
| tree | b5d01e060438ea91f27694f1f1f99d1e35ca8e18 /Zend/zend_builtin_functions.c | |
| parent | 76a7470160f977e486a1c9953012241abb5c1159 (diff) | |
| parent | f65ae82c55b986fbc1e140de998b4a9c44911cac (diff) | |
| download | php-git-2d339fa4d1e82c888e4f514a741eb7ac14055671.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed #73973 - debug_zval_dump() assertion error for resource consts with --enable-debug
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 8d0a41ca73..6f333cb041 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -879,9 +879,6 @@ static void copy_constant_array(zval *dst, zval *src) /* {{{ */ } } else if (Z_REFCOUNTED_P(val)) { Z_ADDREF_P(val); - if (UNEXPECTED(Z_TYPE_INFO_P(val) == IS_RESOURCE_EX)) { - Z_TYPE_INFO_P(new_val) &= ~(IS_TYPE_REFCOUNTED << Z_TYPE_FLAGS_SHIFT); - } } } ZEND_HASH_FOREACH_END(); } @@ -924,12 +921,7 @@ repeat: case IS_FALSE: case IS_TRUE: case IS_NULL: - break; case IS_RESOURCE: - ZVAL_COPY(&val_free, val); - /* TODO: better solution than this tricky disable dtor on resource? */ - Z_TYPE_INFO(val_free) &= ~(IS_TYPE_REFCOUNTED << Z_TYPE_FLAGS_SHIFT); - val = &val_free; break; case IS_ARRAY: if (!Z_IMMUTABLE_P(val)) { |