clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

MFB: Fixed bug #36949 (invalid internal mysqli objects dtor)

Browse Source
This commit is contained in:
Michael Wallner 2006-05-29 16:55:40 +00:00
parent c051139ad5
commit 5777060367
2 changed files with 55 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ext/mysqli/mysqli.c
View File

@ -135,22 +135,7 @@ void php_clear_mysql(MY_MYSQL *mysql) {
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 @@ static void mysqli_objects_destroy_object(void *object, zend_object_handle handl
}
intern->ptr = NULL;
my_efree(my_res);
zend_object_std_dtor(&intern->zo TSRMLS_CC);
efree(intern);
}
/* }}} */
@ -361,7 +349,7 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *class_
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;

50
ext/mysqli/tests/bug36949.phpt Normal file
View File

@ -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>