diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-07-04 19:22:24 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-07-04 19:22:24 +0300 |
| commit | 4a475a4976db92e71949786cdf5990c61514261e (patch) | |
| tree | 6934c9e00200e6388256656b8fa71c97a1a3a158 /ext/phar/phar_object.c | |
| parent | d798fd491be77943fb751ad97d85475bf324192c (diff) | |
| download | php-git-4a475a4976db92e71949786cdf5990c61514261e.tar.gz | |
Replace legacy zval_dtor() by zval_ptr_dtor_nogc() or even more specialized destructors.
zval_dtor() doesn't make a lot of sense in PHP-7.* and it's used incorrectly in some places.
Its occurances should be replaced by zval_ptr_dtor() or zval_ptr_dtor_nogc(), or even more specialized destructors.
Diffstat (limited to 'ext/phar/phar_object.c')
| -rw-r--r-- | ext/phar/phar_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 5f866c6b2a..f2fd426241 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -1448,7 +1448,7 @@ static int phar_build(zend_object_iterator *iter, void *puser) /* {{{ */ str_key = estrndup(Z_STRVAL(key), str_key_len); save = str_key; - zval_dtor(&key); + zval_ptr_dtor_str(&key); } else { zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0, "Iterator %s returned an invalid key (must return a string)", ZSTR_VAL(ce->name)); return ZEND_HASH_APPLY_STOP; @@ -1576,7 +1576,7 @@ phar_spl_fileinfo: str_key = estrndup(Z_STRVAL(key), str_key_len); save = str_key; - zval_dtor(&key); + zval_ptr_dtor_str(&key); } else { zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0, "Iterator %s returned an invalid key (must return a string)", ZSTR_VAL(ce->name)); return ZEND_HASH_APPLY_STOP; |