summaryrefslogtreecommitdiff
path: root/ext/tokenizer/tokenizer.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2018-07-04 19:22:24 +0300
committerDmitry Stogov <dmitry@zend.com>2018-07-04 19:22:24 +0300
commit4a475a4976db92e71949786cdf5990c61514261e (patch)
tree6934c9e00200e6388256656b8fa71c97a1a3a158 /ext/tokenizer/tokenizer.c
parentd798fd491be77943fb751ad97d85475bf324192c (diff)
downloadphp-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/tokenizer/tokenizer.c')
-rw-r--r--ext/tokenizer/tokenizer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c
index 60df344395..dae79c0173 100644
--- a/ext/tokenizer/tokenizer.c
+++ b/ext/tokenizer/tokenizer.c
@@ -148,7 +148,7 @@ static zend_bool tokenize(zval *return_value, zend_string *source)
add_token(return_value, token_type, zendtext, zendleng, token_line);
if (Z_TYPE(token) != IS_UNDEF) {
- zval_dtor(&token);
+ zval_ptr_dtor_nogc(&token);
ZVAL_UNDEF(&token);
}
@@ -177,7 +177,7 @@ static zend_bool tokenize(zval *return_value, zend_string *source)
token_line = CG(zend_lineno);
}
- zval_dtor(&source_zval);
+ zval_ptr_dtor_str(&source_zval);
zend_restore_lexical_state(&original_lex_state);
return 1;
@@ -255,7 +255,7 @@ static zend_bool tokenize_parse(zval *return_value, zend_string *source)
zend_restore_lexical_state(&original_lex_state);
CG(in_compilation) = original_in_compilation;
- zval_dtor(&source_zval);
+ zval_ptr_dtor_str(&source_zval);
return success;
}