diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-07-09 12:46:46 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-07-09 12:46:46 +0300 |
| commit | 67b4c3379a1c7f8a34522972c9cb3adf3776bc4a (patch) | |
| tree | 4089d3d836a02d9b94d2eb6304ac3b9d3c57e21f /ext/spl/spl_fixedarray.c | |
| parent | 094c2aaf8371064528878f63e12b8347eefb2b71 (diff) | |
| download | php-git-67b4c3379a1c7f8a34522972c9cb3adf3776bc4a.tar.gz | |
Uze ZVAL_COPY_DEREF() instead of ZVAL_DEREF() and ZVAL_COPY()
Diffstat (limited to 'ext/spl/spl_fixedarray.c')
| -rw-r--r-- | ext/spl/spl_fixedarray.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index 3690ce6c38..e906c233eb 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -402,8 +402,7 @@ static inline void spl_fixedarray_object_write_dimension_helper(spl_fixedarray_o if (!Z_ISUNDEF(intern->array.elements[index])) { zval_ptr_dtor(&(intern->array.elements[index])); } - ZVAL_DEREF(value); - ZVAL_COPY(&intern->array.elements[index], value); + ZVAL_COPY_DEREF(&intern->array.elements[index], value); } } /* }}} */ @@ -691,8 +690,7 @@ SPL_METHOD(SplFixedArray, fromArray) spl_fixedarray_init(&array, tmp); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(data), num_index, str_index, element) { - ZVAL_DEREF(element); - ZVAL_COPY(&array.elements[num_index], element); + ZVAL_COPY_DEREF(&array.elements[num_index], element); } ZEND_HASH_FOREACH_END(); } else if (num > 0 && !save_indexes) { @@ -702,8 +700,7 @@ SPL_METHOD(SplFixedArray, fromArray) spl_fixedarray_init(&array, num); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(data), element) { - ZVAL_DEREF(element); - ZVAL_COPY(&array.elements[i], element); + ZVAL_COPY_DEREF(&array.elements[i], element); i++; } ZEND_HASH_FOREACH_END(); } else { @@ -788,8 +785,7 @@ SPL_METHOD(SplFixedArray, offsetGet) value = spl_fixedarray_object_read_dimension_helper(intern, zindex); if (value) { - ZVAL_DEREF(value); - ZVAL_COPY(return_value, value); + ZVAL_COPY_DEREF(return_value, value); } else { RETURN_NULL(); } @@ -983,8 +979,7 @@ SPL_METHOD(SplFixedArray, current) value = spl_fixedarray_object_read_dimension_helper(intern, &zindex); if (value) { - ZVAL_DEREF(value); - ZVAL_COPY(return_value, value); + ZVAL_COPY_DEREF(return_value, value); } else { RETURN_NULL(); } |