Use zval_ptr_dtor() imstead of zval_dtor()

diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index a9220863d2fb1dfd2d63d4afa4427774a6037424..1377c18a12d27ed4dae91e95fb834ca1d3d6389a 100644 (file)
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -399,7 +399,7 @@ static int dom_property_exists(zval *object, zval *member, int check_empty, void
                        } else if (check_empty == 0) {
                                retval = (Z_TYPE(tmp) != IS_NULL);
                        }
-                       zval_dtor(&tmp);
+                       zval_ptr_dtor(&tmp);
                }
        } else {
                retval = zend_std_has_property(object, member, check_empty, cache_slot);
@@ -439,7 +439,7 @@ static HashTable* dom_get_debug_info_helper(zval *object, int *is_temp) /* {{{ *
                }
 
                if (Z_TYPE(value) == IS_OBJECT) {
-                       zval_dtor(&value);
+                       zval_ptr_dtor(&value);
                        ZVAL_NEW_STR(&value, object_str);
                        zend_string_addref(object_str);
                }

diff --git a/ext/filter/filter_private.h b/ext/filter/filter_private.h
index 0247526b49a19cd43468ccc87331af9a4cf5259d..a56cecb432e1a60c0d5e01c7d5566f596adbb662 100644 (file)
--- a/ext/filter/filter_private.h
+++ b/ext/filter/filter_private.h
@@ -97,7 +97,7 @@
 || id == FILTER_CALLBACK)
 
 #define RETURN_VALIDATION_FAILED       \
-       zval_dtor(value);       \
+       zval_ptr_dtor(value);   \
        if (flags & FILTER_NULL_ON_FAILURE) {   \
                ZVAL_NULL(value);       \
        } else {        \

diff --git a/ext/interbase/ibase_events.c b/ext/interbase/ibase_events.c
index b96e0b820adc2b285d806d53230e8448ad960c50..9eb8cef18edc1a1307090025935f028812af75a2 100644 (file)
--- a/ext/interbase/ibase_events.c
+++ b/ext/interbase/ibase_events.c
@@ -57,7 +57,7 @@ void _php_ibase_free_event(ibase_event *event) /* {{{ */
        }
 
        if (Z_TYPE(event->callback) != IS_UNDEF) {
-               zval_dtor(&event->callback);
+               zval_ptr_dtor(&event->callback);
                ZVAL_UNDEF(&event->callback);
 
                _php_ibase_event_free(event->event_buffer,event->result_buffer);

diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c
index 854623f31440cb2eeb2ec229139c21fed9fed15c..2a4596b4751f83f63ab58af390abf466f8cecee7 100644 (file)
--- a/ext/pdo_mysql/mysql_statement.c
+++ b/ext/pdo_mysql/mysql_statement.c
@@ -34,7 +34,7 @@
 
 #ifdef PDO_USE_MYSQLND
 #      define pdo_mysql_stmt_execute_prepared(stmt) pdo_mysql_stmt_execute_prepared_mysqlnd(stmt)
-#      define pdo_free_bound_result(res) zval_dtor(res.zv)
+#      define pdo_free_bound_result(res) zval_ptr_dtor(res.zv)
 #      define pdo_mysql_stmt_close(stmt) mysqlnd_stmt_close(stmt, 0)
 #else
 #      define pdo_mysql_stmt_execute_prepared(stmt) pdo_mysql_stmt_execute_prepared_libmysql(stmt)

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index a75abf965c82c1fd32ffe988b4ce7a6b403a5b0a..1235781d987e50311848abc73dc17cd631b53b6c 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -1503,7 +1503,7 @@ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 
 cleanup:
        for (i = 0; i < ZEND_NUM_ARGS(); i++) {
-               zval_dtor(&args[i]);
+               zval_ptr_dtor(&args[i]);
        }
        efree(args);
        smart_str_free(&str);
@@ -1511,7 +1511,7 @@ cleanup:
 
 err:
        for (i = 0; i < ZEND_NUM_ARGS(); i++) {
-               zval_dtor(&args[i]);
+               zval_ptr_dtor(&args[i]);
        }
        efree(args);
        smart_str_free(&str);

diff --git a/ext/phar/zip.c b/ext/phar/zip.c
index e044a5c3ff0077238ae6617794105bddfb1b3b56..9c9e3f6d68f78817f77dc20561732f1be053c2ca 100644 (file)
--- a/ext/phar/zip.c
+++ b/ext/phar/zip.c
@@ -299,7 +299,7 @@ foundit:
                        zend_hash_destroy(&mydata->virtual_dirs); \
                        HT_FLAGS(&mydata->virtual_dirs) = 0; \
                        php_stream_close(fp); \
-                       zval_dtor(&mydata->metadata); \
+                       zval_ptr_dtor(&mydata->metadata); \
                        if (mydata->signature) { \
                                efree(mydata->signature); \
                        } \
@@ -321,7 +321,7 @@ foundit:
                        zend_hash_destroy(&mydata->virtual_dirs); \
                        HT_FLAGS(&mydata->virtual_dirs) = 0; \
                        php_stream_close(fp); \
-                       zval_dtor(&mydata->metadata); \
+                       zval_ptr_dtor(&mydata->metadata); \
                        if (mydata->signature) { \
                                efree(mydata->signature); \
                        } \

diff --git a/ext/session/session.c b/ext/session/session.c
index 609542d51cea36f95585dfbe0aaeeda133bec924..504a119e5cc5356a3caf8fe1c6270588e0e8d108 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -2981,7 +2981,7 @@ static zend_bool early_find_sid_in(zval *dest, int where, php_session_rfc1867_pr
 
        if ((ppid = zend_hash_str_find(Z_ARRVAL(PG(http_globals)[where]), PS(session_name), progress->sname_len))
                        && Z_TYPE_P(ppid) == IS_STRING) {
-               zval_dtor(dest);
+               zval_ptr_dtor(dest);
                ZVAL_DEREF(ppid);
                ZVAL_COPY(dest, ppid);
                return 1;
@@ -3111,7 +3111,7 @@ static int php_session_rfc1867_callback(unsigned int event, void *event_data, vo
                                size_t name_len = strlen(data->name);
 
                                if (name_len == progress->sname_len && memcmp(data->name, PS(session_name), name_len) == 0) {
-                                       zval_dtor(&progress->sid);
+                                       zval_ptr_dtor(&progress->sid);
                                        ZVAL_STRINGL(&progress->sid, (*data->value), value_len);
                                } else if (name_len == strlen(PS(rfc1867_name)) && memcmp(data->name, PS(rfc1867_name), name_len + 1) == 0) {
                                        smart_str_free(&progress->key);

diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c
index feb97356c98ba99d0c7b09cbd27a63be7b2a7a6c..6eede2b20a79f96a691e43e03ea12cda94fe37f5 100644 (file)
--- a/ext/sockets/conversions.c
+++ b/ext/sockets/conversions.c
@@ -358,7 +358,7 @@ double_case:
                break;
        }
 
-       zval_dtor(&lzval);
+       zval_ptr_dtor(&lzval);
 
        return ret;
 }

diff --git a/sapi/phpdbg/phpdbg_wait.c b/sapi/phpdbg/phpdbg_wait.c
index 8cfc337916199035b18a6b42087b1bd1dd69ae13..96504c7d7e39c2cf5b93afc2db3bfc670b2f8fae 100644 (file)
--- a/sapi/phpdbg/phpdbg_wait.c
+++ b/sapi/phpdbg/phpdbg_wait.c
@@ -327,7 +327,7 @@ void phpdbg_webdata_decompress(char *msg, int len) {
                } ZEND_HASH_FOREACH_END();
        }
 
-       zval_dtor(&zv);
+       zval_ptr_dtor(&zv);
        if (free_zv) {
                /* separate freeing to not dtor the symtable too, just the container zval... */
                efree(free_zv);