avoid double free and use zval_dtor() where neccessary

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index fcf946372d395bbbbabc603c22229a6fd2cc703d..c2fda21b0ec05a5f0dd10c0986836b493bd7e330 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -202,8 +202,7 @@ void php_clear_mysql(MY_MYSQL *mysql) {
                mysql->hash_key = NULL;
        }
        if (mysql->li_read) {
-               efree(Z_STRVAL_P(mysql->li_read));
-               FREE_ZVAL(mysql->li_read);
+               zval_dtor(mysql->li_read);
                mysql->li_read = NULL;
        }
 }

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 17dfe78613336c07bced2c53ba4d2722a225656b..c42c14a6e59644c9be72a3547153a95f2566a4e0 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1336,7 +1336,6 @@ PHP_FUNCTION(mysqli_set_local_infile_default)
        MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID);
 
        if (mysql->li_read) {
-               efree(Z_STRVAL_P(mysql->li_read));
                zval_dtor(mysql->li_read);
                mysql->li_read = NULL;
        }