tony2001 Mon Jun 27 14:22:00 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/mysqli mysqli.c
Log:
MFH: fix #33491 (crash after extending MySQLi internal class)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.443&r2=1.1760.2.444&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.443 php-src/NEWS:1.1760.2.444
--- php-src/NEWS:1.1760.2.443 Fri Jun 24 04:45:41 2005
+++ php-src/NEWS Mon Jun 27 14:21:57 2005
@@ -14,6 +14,7 @@
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
- Fixed memory corruption in stristr(). (Derick)
- Fixed segfaults when CURL callback functions throw exception. (Tony)
+- Fixed bug #33491 (crash after extending MySQLi internal class). (Tony)
- Fixed bug #33340 (CLI Crash when calling php:function from XSLT). (Rob)
- Fixed bug #33277 (private method accessed by child class). (Dmitry)
- Fixed bug #33268 (iconv_strlen() works only with a parameter of < 3 in
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.43.2.16&r2=1.43.2.17&ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.43.2.16
php-src/ext/mysqli/mysqli.c:1.43.2.17
--- php-src/ext/mysqli/mysqli.c:1.43.2.16 Thu May 5 09:30:31 2005
+++ php-src/ext/mysqli/mysqli.c Mon Jun 27 14:22:00 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.43.2.16 2005/05/05 13:30:31 georg Exp $
+ $Id: mysqli.c,v 1.43.2.17 2005/06/27 18:22:00 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -120,17 +120,28 @@
static void mysqli_objects_free_storage(zend_object *object TSRMLS_DC)
{
mysqli_object *intern = (mysqli_object *)object;
+
+ zend_objects_free_object_storage(&(intern->zo) TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ 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 = (MYSQLI_RESOURCE *)intern->ptr;
- zend_hash_destroy(intern->zo.properties);
- FREE_HASHTABLE(intern->zo.properties);
+ zend_objects_destroy_object(object, handle TSRMLS_CC);
/* link object */
if (instanceof_function(intern->zo.ce, mysqli_link_class_entry
TSRMLS_CC)) {
if (my_res && my_res->ptr) {
MY_MYSQL *mysql = (MY_MYSQL *)my_res->ptr;
-
- mysql_close(mysql->mysql);
+
+ if (mysql->mysql) {
+ mysql_close(mysql->mysql);
+ }
php_clear_mysql(mysql);
efree(mysql);
@@ -146,8 +157,8 @@
mysql_free_result(my_res->ptr);
}
}
+ intern->ptr = NULL;
my_efree(my_res);
- efree(object);
}
/* }}} */
@@ -331,7 +342,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) zend_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) mysqli_objects_destroy_object,
(zend_objects_free_object_storage_t) mysqli_objects_free_storage, NULL
TSRMLS_CC);
retval.handlers = &mysqli_object_handlers;
return retval;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
