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

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

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index fcf946372d..c2fda21b0e 100644
--- 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 17dfe78613..c42c14a6e5 100644
--- 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;
 	}