mike Mon May 29 16:55:40 2006 UTC Modified files: /php-src/ext/mysqli mysqli.c /php-src/ext/mysqli/tests bug36949.phpt Log: MFB: Fixed bug #36949 (invalid internal mysqli objects dtor) http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli.c?r1=1.88&r2=1.89&diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.88 php-src/ext/mysqli/mysqli.c:1.89 --- php-src/ext/mysqli/mysqli.c:1.88 Wed May 10 12:29:09 2006 +++ php-src/ext/mysqli/mysqli.c Mon May 29 16:55:40 2006 @@ -15,7 +15,7 @@ | Author: Georg Richter <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ - $Id: mysqli.c,v 1.88 2006/05/10 12:29:09 andrey Exp $ + $Id: mysqli.c,v 1.89 2006/05/29 16:55:40 mike Exp $ */ #ifdef HAVE_CONFIG_H @@ -135,22 +135,7 @@ static void mysqli_objects_free_storage(zend_object *object TSRMLS_DC) { mysqli_object *intern = (mysqli_object *)object; - - zend_object_std_dtor(&intern->zo TSRMLS_CC); - efree(intern); -} -/* }}} */ - -/* {{{ mysqli_objects_destroy_object - */ -static void mysqli_objects_destroy_object(void *object, zend_object_handle handle TSRMLS_DC) -{ - mysqli_object *intern = (mysqli_object *)object; - MYSQLI_RESOURCE *my_res; - - zend_objects_destroy_object(object, handle TSRMLS_CC); - - my_res = (MYSQLI_RESOURCE *)intern->ptr; + MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr; /* link object */ if (instanceof_function(intern->zo.ce, mysqli_link_class_entry TSRMLS_CC)) { @@ -179,6 +164,9 @@ } intern->ptr = NULL; my_efree(my_res); + + zend_object_std_dtor(&intern->zo TSRMLS_CC); + efree(intern); } /* }}} */ @@ -361,7 +349,7 @@ zend_hash_copy(intern->zo.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); - retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t) mysqli_objects_destroy_object, (zend_objects_free_object_storage_t) mysqli_objects_free_storage, NULL TSRMLS_CC); + retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t) zend_objects_destroy_object, (zend_objects_free_object_storage_t) mysqli_objects_free_storage, NULL TSRMLS_CC); retval.handlers = &mysqli_object_handlers; return retval; http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/tests/bug36949.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mysqli/tests/bug36949.phpt diff -u /dev/null php-src/ext/mysqli/tests/bug36949.phpt:1.2 --- /dev/null Mon May 29 16:55:40 2006 +++ php-src/ext/mysqli/tests/bug36949.phpt Mon May 29 16:55:40 2006 @@ -0,0 +1,50 @@ +--TEST-- +bug #36949 +--SKIPIF-- +<?php require_once('skipif.inc'); ?> +--FILE-- +<?php +include "connect.inc"; + +class A { + + private $mysqli; + + public function __construct() { + global $user, $host, $passwd; + $this->mysqli = new mysqli($host, $user, $passwd); + $result = $this->mysqli->query("SELECT NOW() AS my_time FROM DUAL"); + $row = $result->fetch_object(); + echo $row->my_time."<br>\n"; + $result->close(); + } + + public function __destruct() { + $this->mysqli->close(); + } +} + +class B { + + private $mysqli; + + public function __construct() { + global $user, $host, $passwd; + $this->mysqli = new mysqli($host, $user, $passwd); + $result = $this->mysqli->query("SELECT NOW() AS my_time FROM DUAL"); + $row = $result->fetch_object(); + echo $row->my_time."<br>\n"; + $result->close(); + } + + public function __destruct() { + $this->mysqli->close(); + } +} + +$A = new A(); +$B = new B(); +?> +--EXPECTF-- +%d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d<br> +%d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d<br>
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php