Removed useless zval_ptr_dtor(return_value)

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index cc8e010e578c3e485c2858b3959361ebfc1807dd..2112ff09df45beb5548553c22d47a9c9d20298cf 100644 (file)
--- 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 e88318e6f781181f9ab0f3d70e70b02b5eacabf3..d58e7c59ece4b0a48d22e0425fc20881088b682d 100644 (file)
--- 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 bd941b9190dfbf04e85ba86ac0d6113c3679dd8c..ccfbea03e3f788bed90802200bfa23f6425a8bf0 100644 (file)
--- 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);
                }