tony2001 Tue Sep 13 05:21:37 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mysqli mysqli.c
/php-src NEWS
Log:
MFH: fix #34450 (Segfault when calling mysqli_close() in destructor)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.43.2.17&r2=1.43.2.18&ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.43.2.17
php-src/ext/mysqli/mysqli.c:1.43.2.18
--- php-src/ext/mysqli/mysqli.c:1.43.2.17 Mon Jun 27 14:22:00 2005
+++ php-src/ext/mysqli/mysqli.c Tue Sep 13 05:21:36 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.43.2.17 2005/06/27 18:22:00 tony2001 Exp $
+ $Id: mysqli.c,v 1.43.2.18 2005/09/13 09:21:36 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -130,9 +130,11 @@
static void mysqli_objects_destroy_object(void *object, zend_object_handle
handle TSRMLS_DC)
{
mysqli_object *intern = (mysqli_object *)object;
- MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr;
+ MYSQLI_RESOURCE *my_res;
zend_objects_destroy_object(object, handle TSRMLS_CC);
+
+ my_res = (MYSQLI_RESOURCE *)intern->ptr;
/* link object */
if (instanceof_function(intern->zo.ce, mysqli_link_class_entry
TSRMLS_CC)) {
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.478&r2=1.1760.2.479&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.478 php-src/NEWS:1.1760.2.479
--- php-src/NEWS:1.1760.2.478 Tue Sep 13 02:10:34 2005
+++ php-src/NEWS Tue Sep 13 05:21:36 2005
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 5.0.6
+- Fixed bug #34450 (Segfault when calling mysqli_close() in destructor). (Tony)
- Fixed bug #34449 (ext/soap: XSD_ANYXML functionality not exposed). (Dmitry)
- Fixed bug #34199 (if($obj)/if(!$obj) inconsistency because of cast handler).
(Dmitry, Alex)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
