From: Antony Dovgal <tony2001@php.net>
Date: Tue, 16 Oct 2007 13:20:29 +0000 (+0000)
Subject: avoid double free and use zval_dtor() where neccessary
X-Git-Tag: php-5.2.5RC1~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36e950eb5f63ff28270734a1eae6e4f0a055d9fa;p=php

avoid double free and use zval_dtor() where neccessary
---

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index ee9b804974..011896050a 100644
--- 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 fd01ba9ffa..378514834d 100644
--- 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;
 	}