avoid double free and use zval_dtor() where neccessary

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index ee9b80497462d06d69c0c5274b58065940ba5ab0..011896050a7e79fe2fcba80e27bd60262f075775 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -125,8 +125,7 @@ void php_clear_stmt_bind(MY_STMT *stmt)
 /* {{{ php_clear_mysql */
 void php_clear_mysql(MY_MYSQL *mysql) {
        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 fd01ba9ffaebd5955563590f9581d2a7cf3af3f5..378514834dba5a1b6ca14efe554f45b2ec97c8da 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1170,7 +1170,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;
        }