From 4a475a4976db92e71949786cdf5990c61514261e Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 4 Jul 2018 19:22:24 +0300 Subject: 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. --- ext/tokenizer/tokenizer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ext/tokenizer/tokenizer.c') 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; } -- cgit v1.2.1