diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-12-26 12:58:11 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-12-26 12:58:11 +0300 |
| commit | 22c9d19144285efaa28ece5d510fbd9ab800ffa8 (patch) | |
| tree | 344854fed19f1c3bdf388eab79fe7933418b145b | |
| parent | d90a5d2e1a41c22ef632c2263784e87d15b58dde (diff) | |
| download | php-git-22c9d19144285efaa28ece5d510fbd9ab800ffa8.tar.gz | |
Removed useless zval_ptr_dtor(return_value)
| -rw-r--r-- | ext/filter/filter.c | 2 | ||||
| -rw-r--r-- | ext/imap/php_imap.c | 4 | ||||
| -rw-r--r-- | ext/spl/spl_directory.c | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/ext/filter/filter.c b/ext/filter/filter.c index cc8e010e57..2112ff09df 100644 --- a/ext/filter/filter.c +++ b/ext/filter/filter.c @@ -676,11 +676,9 @@ static void php_filter_array_handler(zval *input, zval *op, zval *return_value, zval *tmp, *arg_elm; if (!op) { - zval_ptr_dtor(return_value); ZVAL_DUP(return_value, input); php_filter_call(return_value, FILTER_DEFAULT, NULL, 0, FILTER_REQUIRE_ARRAY); } else if (Z_TYPE_P(op) == IS_LONG) { - zval_ptr_dtor(return_value); ZVAL_DUP(return_value, input); php_filter_call(return_value, Z_LVAL_P(op), NULL, 0, FILTER_REQUIRE_ARRAY); } else if (Z_TYPE_P(op) == IS_ARRAY) { diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index e88318e6f7..d58e7c59ec 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -3353,13 +3353,13 @@ PHP_FUNCTION(imap_bodystruct) RETURN_FALSE; } - object_init(return_value); body=mail_body(imap_le_struct->imap_stream, msg, (unsigned char*)ZSTR_VAL(section)); if (body == NULL) { - zval_ptr_dtor(return_value); RETURN_FALSE; } + + object_init(return_value); if (body->type <= TYPEMAX) { add_property_long(return_value, "type", body->type); } diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index bd941b9190..ccfbea03e3 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -2129,7 +2129,6 @@ static int spl_filesystem_file_read_csv(spl_filesystem_object *intern, char deli php_fgetcsv(intern->u.file.stream, delimiter, enclosure, escape, buf_len, buf, &intern->u.file.current_zval); if (return_value) { - zval_ptr_dtor(return_value); value = &intern->u.file.current_zval; ZVAL_COPY_DEREF(return_value, value); } |