From: Antony Dovgal <tony2001@php.net>
Date: Wed, 17 Oct 2007 08:18:09 +0000 (+0000)
Subject: MFH: use correct dtro and variable for the callback
X-Git-Tag: RELEASE_1_3_1~839
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=780fa84fbdeea2afcca4fa204d68e4619024b481;p=php

MFH: use correct dtro and variable for the callback
---

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 7aca237494..00e8ac8efd 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -202,7 +202,7 @@ void php_clear_mysql(MY_MYSQL *mysql) {
 		mysql->hash_key = NULL;
 	}
 	if (mysql->li_read) {
-		zval_dtor(mysql->li_read);
+		zval_ptr_dtor(&(mysql->li_read));
 		mysql->li_read = NULL;
 	}
 }
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index c42c14a6e5..39e50a980b 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1336,7 +1336,7 @@ PHP_FUNCTION(mysqli_set_local_infile_default)
 	MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID);
 
 	if (mysql->li_read) {
-		zval_dtor(mysql->li_read);
+		zval_ptr_dtor(&(mysql->li_read));
 		mysql->li_read = NULL;
 	}
 }
@@ -1364,7 +1364,6 @@ PHP_FUNCTION(mysqli_set_local_infile_handler)
 		efree(callback_name);
 		RETURN_FALSE;
 	}
-	efree(callback_name);
 
 	/* save callback function */
 	if (!mysql->li_read) {
@@ -1372,7 +1371,7 @@ PHP_FUNCTION(mysqli_set_local_infile_handler)
 	} else {
 		zval_dtor(mysql->li_read);
 	}
-	ZVAL_STRINGL(mysql->li_read, Z_STRVAL_P(callback_func), Z_STRLEN_P(callback_func), 1);
+	ZVAL_STRINGL(mysql->li_read, callback_name, 0);
 
 	RETURN_TRUE;
 }