tony2001 Wed Oct 17 08:18:09 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli_api.c mysqli.c
Log:
MFH: use correct dtro and variable for the callback
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.4&r2=1.118.2.22.2.16.2.5&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.4
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.5
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.4 Tue Oct 16 13:20:14 2007
+++ php-src/ext/mysqli/mysqli_api.c Wed Oct 17 08:18:09 2007
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.118.2.22.2.16.2.4 2007/10/16 13:20:14 tony2001 Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.16.2.5 2007/10/17 08:18:09 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1336,7 +1336,7 @@
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 @@
efree(callback_name);
RETURN_FALSE;
}
- efree(callback_name);
/* save callback function */
if (!mysql->li_read) {
@@ -1372,7 +1371,7 @@
} 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;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.5&r2=1.72.2.16.2.17.2.6&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.5
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.6
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.5 Tue Oct 16 20:56:22 2007
+++ php-src/ext/mysqli/mysqli.c Wed Oct 17 08:18:09 2007
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.5 2007/10/16 20:56:22 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.6 2007/10/17 08:18:09 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -202,7 +202,7 @@
mysql->hash_key = NULL;
}
if (mysql->li_read) {
- zval_dtor(mysql->li_read);
+ zval_ptr_dtor(&(mysql->li_read));
mysql->li_read = NULL;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
