diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-07-10 10:05:20 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-07-10 10:05:20 +0000 |
| commit | 690e86fdb2e4b4f771d79174a94180903dbc8fe7 (patch) | |
| tree | ecb95a49afbed7c8ff634580f4d23e2ca008523b /ext/mysqli | |
| parent | 795a482a48b4b72319d3c6911d021a45648da02b (diff) | |
| download | php-git-690e86fdb2e4b4f771d79174a94180903dbc8fe7.tar.gz | |
Fixed bug #38019 (segfault extending mysqli class)
Diffstat (limited to 'ext/mysqli')
| -rw-r--r-- | ext/mysqli/mysqli.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 39ba897b7e..79dfbf490c 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -132,13 +132,15 @@ void php_clear_mysql(MY_MYSQL *mysql) { } /* }}} */ -/* {{{ mysqli_objects_free_storage +/* {{{ mysqli_objects_destroy_object */ -static void mysqli_objects_free_storage(zend_object *object TSRMLS_DC) +static void mysqli_objects_destroy_object(zend_object *object, zend_object_handle handle TSRMLS_DC) { mysqli_object *intern = (mysqli_object *)object; MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr; + 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) { @@ -164,9 +166,17 @@ static void mysqli_objects_free_storage(zend_object *object TSRMLS_DC) php_clear_warnings((MYSQLI_WARNING *)my_res->info); } } - intern->ptr = NULL; - my_efree(my_res); - +} +/* }}} */ + +/* {{{ mysqli_objects_free_storage + */ +static void mysqli_objects_free_storage(zend_object *object TSRMLS_DC) +{ + mysqli_object *intern = (mysqli_object *)object; + MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr; + + my_efree(my_res); zend_object_std_dtor(&intern->zo TSRMLS_CC); efree(intern); } @@ -351,7 +361,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) 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; |