diff options
Diffstat (limited to 'ext/mysqli/mysqli.c')
| -rw-r--r-- | ext/mysqli/mysqli.c | 476 |
1 files changed, 240 insertions, 236 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index ad4e25c66f..878c8fb946 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -1,8 +1,8 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -39,29 +39,23 @@ ZEND_DECLARE_MODULE_GLOBALS(mysqli) static PHP_GINIT_FUNCTION(mysqli); -#define MYSQLI_ADD_PROPERTIES(a,b) \ +#define MYSQLI_ADD_PROPERTIES(a, b) \ { \ int i = 0; \ while (b[i].pname != NULL) { \ mysqli_add_property((a), (b)[i].pname, (b)[i].pname_length, \ (mysqli_read_t)(b)[i].r_func, (mysqli_write_t)(b)[i].w_func TSRMLS_CC); \ i++; \ - }\ + } \ } -#define MYSQLI_ADD_PROPERTIES_INFO(a,b) \ -{ \ - int i = 0; \ - while (b[i].name != NULL) { \ - zend_declare_property_null((a), (b)[i].name, (b)[i].name_length, ZEND_ACC_PUBLIC TSRMLS_CC); \ - i++; \ - }\ -} - - - -static zend_object_handlers mysqli_object_handlers; static HashTable classes; +static zend_object_handlers mysqli_object_handlers; +static zend_object_handlers mysqli_object_driver_handlers; +static zend_object_handlers mysqli_object_link_handlers; +static zend_object_handlers mysqli_object_result_handlers; +static zend_object_handlers mysqli_object_stmt_handlers; +static zend_object_handlers mysqli_object_warning_handlers; static HashTable mysqli_driver_properties; static HashTable mysqli_link_properties; static HashTable mysqli_result_properties; @@ -76,23 +70,25 @@ zend_class_entry *mysqli_warning_class_entry; zend_class_entry *mysqli_exception_class_entry; -typedef int (*mysqli_read_t)(mysqli_object *obj, zval **retval TSRMLS_DC); +typedef zval *(*mysqli_read_t)(mysqli_object *obj, zval *rv TSRMLS_DC); typedef int (*mysqli_write_t)(mysqli_object *obj, zval *newval TSRMLS_DC); typedef struct _mysqli_prop_handler { - char *name; - size_t name_len; + zend_string *name; mysqli_read_t read_func; mysqli_write_t write_func; } mysqli_prop_handler; static int le_pmysqli; +static void free_prop_handler(zval *el) { + pefree(Z_PTR_P(el), 1); +} /* Destructor for mysqli entries in free_links/used_links */ void php_mysqli_dtor_p_elements(void *data) { - MYSQL *mysql = (MYSQL *) data; + MYSQL *mysql = (MYSQL *)data; TSRMLS_FETCH(); mysqli_close(mysql, MYSQLI_CLOSE_IMPLICIT); } @@ -100,8 +96,8 @@ void php_mysqli_dtor_p_elements(void *data) ZEND_RSRC_DTOR_FUNC(php_mysqli_dtor) { - if (rsrc->ptr) { - mysqli_plist_entry *plist = (mysqli_plist_entry *) rsrc->ptr; + if (res->ptr) { + mysqli_plist_entry *plist = (mysqli_plist_entry *)res->ptr; zend_ptr_stack_clean(&plist->free_links, php_mysqli_dtor_p_elements, 0); zend_ptr_stack_destroy(&plist->free_links); free(plist); @@ -131,9 +127,7 @@ void php_free_stmt_bind_buffer(BIND_BUFFER bbuf, int type) efree(bbuf.buf[i].val); } - if (bbuf.vars[i]) { - zval_ptr_dtor(&bbuf.vars[i]); - } + zval_ptr_dtor(&bbuf.vars[i]); } if (bbuf.vars) { @@ -176,8 +170,11 @@ void php_clear_stmt_bind(MY_STMT *stmt TSRMLS_DC) php_free_stmt_bind_buffer(stmt->param, FETCH_SIMPLE); /* Clean output bind */ php_free_stmt_bind_buffer(stmt->result, FETCH_RESULT); -#endif + if (!Z_ISUNDEF(stmt->link_handle)) { + zval_ptr_dtor(&stmt->link_handle); + } +#endif if (stmt->query) { efree(stmt->query); } @@ -188,27 +185,25 @@ void php_clear_stmt_bind(MY_STMT *stmt TSRMLS_DC) /* {{{ php_clear_mysql */ void php_clear_mysql(MY_MYSQL *mysql) { if (mysql->hash_key) { - efree(mysql->hash_key); + zend_string_release(mysql->hash_key); mysql->hash_key = NULL; } - if (mysql->li_read) { + if (!Z_ISUNDEF(mysql->li_read)) { zval_ptr_dtor(&(mysql->li_read)); - mysql->li_read = NULL; + ZVAL_UNDEF(&mysql->li_read); } } /* }}} */ /* {{{ mysqli_objects_free_storage */ -static void mysqli_objects_free_storage(void *object TSRMLS_DC) +static void mysqli_objects_free_storage(zend_object *object TSRMLS_DC) { - zend_object *zo = (zend_object *)object; - mysqli_object *intern = (mysqli_object *)zo; + mysqli_object *intern = php_mysqli_fetch_object(object); MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr; my_efree(my_res); zend_object_std_dtor(&intern->zo TSRMLS_CC); - efree(intern); } /* }}} */ @@ -216,10 +211,9 @@ static void mysqli_objects_free_storage(void *object TSRMLS_DC) /* {{{ mysqli_link_free_storage */ -static void mysqli_link_free_storage(void *object TSRMLS_DC) +static void mysqli_link_free_storage(zend_object *object TSRMLS_DC) { - zend_object *zo = (zend_object *)object; - mysqli_object *intern = (mysqli_object *)zo; + mysqli_object *intern = php_mysqli_fetch_object(object); MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr; if (my_res && my_res->ptr) { @@ -236,7 +230,7 @@ static void mysqli_link_free_storage(void *object TSRMLS_DC) /* }}} */ /* {{{ mysql_driver_free_storage */ -static void mysqli_driver_free_storage(void *object TSRMLS_DC) +static void mysqli_driver_free_storage(zend_object *object TSRMLS_DC) { mysqli_objects_free_storage(object TSRMLS_CC); } @@ -244,10 +238,9 @@ static void mysqli_driver_free_storage(void *object TSRMLS_DC) /* {{{ mysqli_stmt_free_storage */ -static void mysqli_stmt_free_storage(void *object TSRMLS_DC) +static void mysqli_stmt_free_storage(zend_object *object TSRMLS_DC) { - zend_object *zo = (zend_object *)object; - mysqli_object *intern = (mysqli_object *)zo; + mysqli_object *intern = php_mysqli_fetch_object(object); MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr; if (my_res && my_res->ptr) { @@ -260,10 +253,9 @@ static void mysqli_stmt_free_storage(void *object TSRMLS_DC) /* {{{ mysqli_result_free_storage */ -static void mysqli_result_free_storage(void *object TSRMLS_DC) +static void mysqli_result_free_storage(zend_object *object TSRMLS_DC) { - zend_object *zo = (zend_object *)object; - mysqli_object *intern = (mysqli_object *)zo; + mysqli_object *intern = php_mysqli_fetch_object(object); MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr; if (my_res && my_res->ptr) { @@ -275,10 +267,9 @@ static void mysqli_result_free_storage(void *object TSRMLS_DC) /* {{{ mysqli_warning_free_storage */ -static void mysqli_warning_free_storage(void *object TSRMLS_DC) +static void mysqli_warning_free_storage(zend_object *object TSRMLS_DC) { - zend_object *zo = (zend_object *)object; - mysqli_object *intern = (mysqli_object *)zo; + mysqli_object *intern = php_mysqli_fetch_object(object); MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr; if (my_res && my_res->ptr) { @@ -290,11 +281,10 @@ static void mysqli_warning_free_storage(void *object TSRMLS_DC) /* }}} */ /* {{{ mysqli_read_na */ -static int mysqli_read_na(mysqli_object *obj, zval **retval TSRMLS_DC) +static zval *mysqli_read_na(mysqli_object *obj, zval *retval TSRMLS_DC) { - *retval = NULL; php_error_docref(NULL TSRMLS_CC, E_ERROR, "Cannot read property"); - return FAILURE; + return NULL; } /* }}} */ @@ -306,87 +296,73 @@ static int mysqli_write_na(mysqli_object *obj, zval *newval TSRMLS_DC) } /* }}} */ -#ifndef Z_ADDREF_P -/* PHP 5.2, old GC */ -#define Z_ADDREF_P(pz) (++(pz)->refcount) -#define Z_REFCOUNT_P(pz) ((pz)->refcount) -#define Z_SET_REFCOUNT_P(pz, rc) ((pz)->refcount = rc) -#endif - - /* {{{ mysqli_read_property */ -zval *mysqli_read_property(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC) +zval *mysqli_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv TSRMLS_DC) { zval tmp_member; zval *retval; mysqli_object *obj; - mysqli_prop_handler *hnd; - int ret; + mysqli_prop_handler *hnd = NULL; - ret = FAILURE; - obj = (mysqli_object *)zend_objects_get_address(object TSRMLS_CC); + obj = Z_MYSQLI_P(object); - if (member->type != IS_STRING) { - tmp_member = *member; - zval_copy_ctor(&tmp_member); + if (Z_TYPE_P(member) != IS_STRING) { + ZVAL_DUP(&tmp_member, member); convert_to_string(&tmp_member); member = &tmp_member; } if (obj->prop_handler != NULL) { - ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd); + hnd = zend_hash_find_ptr(obj->prop_handler, Z_STR_P(member)); } - if (ret == SUCCESS) { - ret = hnd->read_func(obj, &retval TSRMLS_CC); - if (ret == SUCCESS) { - /* ensure we're creating a temporary variable */ - Z_SET_REFCOUNT_P(retval, 0); - } else { - retval = EG(uninitialized_zval_ptr); + if (hnd) { + retval = hnd->read_func(obj, rv TSRMLS_CC); + if (retval == NULL) { + retval = &EG(uninitialized_zval); } } else { - zend_object_handlers * std_hnd = zend_get_std_object_handlers(); - retval = std_hnd->read_property(object, member, type, key TSRMLS_CC); + zend_object_handlers *std_hnd = zend_get_std_object_handlers(); + retval = std_hnd->read_property(object, member, type, cache_slot, rv TSRMLS_CC); } if (member == &tmp_member) { zval_dtor(member); } - return(retval); + + return retval; } /* }}} */ /* {{{ mysqli_write_property */ -void mysqli_write_property(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC) +void mysqli_write_property(zval *object, zval *member, zval *value, void **cache_slot TSRMLS_DC) { zval tmp_member; mysqli_object *obj; - mysqli_prop_handler *hnd; - int ret; + mysqli_prop_handler *hnd = NULL; - if (member->type != IS_STRING) { - tmp_member = *member; - zval_copy_ctor(&tmp_member); + if (Z_TYPE_P(member) != IS_STRING) { + ZVAL_DUP(&tmp_member, member); convert_to_string(&tmp_member); member = &tmp_member; } - ret = FAILURE; - obj = (mysqli_object *)zend_objects_get_address(object TSRMLS_CC); + obj = Z_MYSQLI_P(object); if (obj->prop_handler != NULL) { - ret = zend_hash_find((HashTable *)obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd); + hnd = zend_hash_find_ptr(obj->prop_handler, Z_STR_P(member)); } - if (ret == SUCCESS) { + + if (hnd) { hnd->write_func(obj, value TSRMLS_CC); + /* ??? if (! PZVAL_IS_REF(value) && Z_REFCOUNT_P(value) == 0) { Z_ADDREF_P(value); zval_ptr_dtor(&value); - } + } */ } else { - zend_object_handlers * std_hnd = zend_get_std_object_handlers(); - std_hnd->write_property(object, member, value, key TSRMLS_CC); + zend_object_handlers *std_hnd = zend_get_std_object_handlers(); + std_hnd->write_property(object, member, value, cache_slot TSRMLS_CC); } if (member == &tmp_member) { @@ -397,45 +373,42 @@ void mysqli_write_property(zval *object, zval *member, zval *value, const zend_l /* {{{ void mysqli_add_property(HashTable *h, char *pname, mysqli_read_t r_func, mysqli_write_t w_func TSRMLS_DC) */ void mysqli_add_property(HashTable *h, const char *pname, size_t pname_len, mysqli_read_t r_func, mysqli_write_t w_func TSRMLS_DC) { - mysqli_prop_handler p; + mysqli_prop_handler p; - p.name = (char*) pname; - p.name_len = pname_len; + p.name = zend_string_init(pname, pname_len, 1); p.read_func = (r_func) ? r_func : mysqli_read_na; p.write_func = (w_func) ? w_func : mysqli_write_na; - zend_hash_add(h, pname, pname_len + 1, &p, sizeof(mysqli_prop_handler), NULL); + zend_hash_add_mem(h, p.name, &p, sizeof(mysqli_prop_handler)); + zend_string_release(p.name); } /* }}} */ -static int mysqli_object_has_property(zval *object, zval *member, int has_set_exists, const zend_literal *key TSRMLS_DC) /* {{{ */ +static int mysqli_object_has_property(zval *object, zval *member, int has_set_exists, void **cache_slot TSRMLS_DC) /* {{{ */ { - mysqli_object *obj = (mysqli_object *)zend_objects_get_address(object TSRMLS_CC); - mysqli_prop_handler p; + mysqli_object *obj = Z_MYSQLI_P(object); + mysqli_prop_handler *p; int ret = 0; - if (zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member) + 1, (void **)&p) == SUCCESS) { + if ((p = zend_hash_find_ptr(obj->prop_handler, Z_STR_P(member))) != NULL) { switch (has_set_exists) { case 2: ret = 1; break; case 1: { - zval *value = mysqli_read_property(object, member, BP_VAR_IS, key TSRMLS_CC); - if (value != EG(uninitialized_zval_ptr)) { + zval rv; + zval *value = mysqli_read_property(object, member, BP_VAR_IS, cache_slot, &rv TSRMLS_CC); + if (value != &EG(uninitialized_zval)) { convert_to_boolean(value); - ret = Z_BVAL_P(value)? 1:0; - /* refcount is 0 */ - Z_ADDREF_P(value); - zval_ptr_dtor(&value); + ret = Z_TYPE_P(value) == IS_TRUE ? 1 : 0; } break; } case 0:{ - zval *value = mysqli_read_property(object, member, BP_VAR_IS, key TSRMLS_CC); - if (value != EG(uninitialized_zval_ptr)) { - ret = Z_TYPE_P(value) != IS_NULL? 1:0; - /* refcount is 0 */ - Z_ADDREF_P(value); - zval_ptr_dtor(&value); + zval rv; + zval *value = mysqli_read_property(object, member, BP_VAR_IS, cache_slot, &rv TSRMLS_CC); + if (value != &EG(uninitialized_zval)) { + ret = Z_TYPE_P(value) != IS_NULL? 1 : 0; + zval_ptr_dtor(value); } break; } @@ -443,87 +416,74 @@ static int mysqli_object_has_property(zval *object, zval *member, int has_set_ex php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value for has_set_exists"); } } else { - zend_object_handlers * std_hnd = zend_get_std_object_handlers(); - ret = std_hnd->has_property(object, member, has_set_exists, key TSRMLS_CC); + zend_object_handlers *std_hnd = zend_get_std_object_handlers(); + ret = std_hnd->has_property(object, member, has_set_exists, cache_slot TSRMLS_CC); } + return ret; } /* }}} */ - -#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3 -HashTable * mysqli_object_get_debug_info(zval *object, int *is_temp TSRMLS_DC) +HashTable *mysqli_object_get_debug_info(zval *object, int *is_temp TSRMLS_DC) { - mysqli_object *obj = (mysqli_object *)zend_objects_get_address(object TSRMLS_CC); + mysqli_object *obj = Z_MYSQLI_P(object); HashTable *retval, *props = obj->prop_handler; - HashPosition pos; mysqli_prop_handler *entry; ALLOC_HASHTABLE(retval); ZEND_INIT_SYMTABLE_EX(retval, zend_hash_num_elements(props) + 1, 0); - zend_hash_internal_pointer_reset_ex(props, &pos); - while (zend_hash_get_current_data_ex(props, (void **)&entry, &pos) == SUCCESS) { - zval member; + ZEND_HASH_FOREACH_PTR(props, entry) { + zval rv, member; zval *value; - INIT_ZVAL(member); - ZVAL_STRINGL(&member, entry->name, entry->name_len, 0); - value = mysqli_read_property(object, &member, BP_VAR_IS, 0 TSRMLS_CC); - if (value != EG(uninitialized_zval_ptr)) { - Z_ADDREF_P(value); - zend_hash_add(retval, entry->name, entry->name_len + 1, &value, sizeof(zval *), NULL); + ZVAL_STR(&member, entry->name); + value = mysqli_read_property(object, &member, BP_VAR_IS, 0, &rv TSRMLS_CC); + if (value != &EG(uninitialized_zval)) { + zend_hash_add(retval, Z_STR(member), value); } - zend_hash_move_forward_ex(props, &pos); - } + } ZEND_HASH_FOREACH_END(); *is_temp = 1; return retval; } -#endif /* {{{ mysqli_objects_new */ -PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *class_type TSRMLS_DC) +PHP_MYSQLI_EXPORT(zend_object *) mysqli_objects_new(zend_class_entry *class_type TSRMLS_DC) { - zend_object_value retval; mysqli_object *intern; zend_class_entry *mysqli_base_class; - zend_objects_free_object_storage_t free_storage; + zend_object_handlers *handlers; - intern = emalloc(sizeof(mysqli_object)); - memset(intern, 0, sizeof(mysqli_object)); - intern->ptr = NULL; - intern->prop_handler = NULL; + intern = ecalloc(1, sizeof(mysqli_object) + sizeof(zval) * (class_type->default_properties_count - 1)); mysqli_base_class = class_type; while (mysqli_base_class->type != ZEND_INTERNAL_CLASS && mysqli_base_class->parent != NULL) { mysqli_base_class = mysqli_base_class->parent; } - zend_hash_find(&classes, mysqli_base_class->name, mysqli_base_class->name_length + 1, - (void **) &intern->prop_handler); + intern->prop_handler = zend_hash_find_ptr(&classes, mysqli_base_class->name); zend_object_std_init(&intern->zo, class_type TSRMLS_CC); object_properties_init(&intern->zo, class_type); /* link object */ if (instanceof_function(class_type, mysqli_link_class_entry TSRMLS_CC)) { - free_storage = mysqli_link_free_storage; + handlers = &mysqli_object_link_handlers; } else if (instanceof_function(class_type, mysqli_driver_class_entry TSRMLS_CC)) { /* driver object */ - free_storage = mysqli_driver_free_storage; + handlers = &mysqli_object_driver_handlers; } else if (instanceof_function(class_type, mysqli_stmt_class_entry TSRMLS_CC)) { /* stmt object */ - free_storage = mysqli_stmt_free_storage; + handlers = &mysqli_object_stmt_handlers; } else if (instanceof_function(class_type, mysqli_result_class_entry TSRMLS_CC)) { /* result object */ - free_storage = mysqli_result_free_storage; + handlers = &mysqli_object_result_handlers; } else if (instanceof_function(class_type, mysqli_warning_class_entry TSRMLS_CC)) { /* warning object */ - free_storage = mysqli_warning_free_storage; + handlers = &mysqli_object_warning_handlers; } else { - free_storage = mysqli_objects_free_storage; + handlers = &mysqli_object_handlers; } - retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t) zend_objects_destroy_object, free_storage, NULL TSRMLS_CC); - retval.handlers = &mysqli_object_handlers; + intern->zo.handlers = handlers; - return retval; + return &intern->zo; } /* }}} */ @@ -532,12 +492,12 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *class_ static MYSQLND *mysqli_convert_zv_to_mysqlnd(zval * zv TSRMLS_DC) { if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), mysqli_link_class_entry TSRMLS_CC)) { - MY_MYSQL * mysql; - MYSQLI_RESOURCE * my_res; - mysqli_object * intern = (mysqli_object *)zend_object_store_get_object(zv TSRMLS_CC); + MY_MYSQL *mysql; + MYSQLI_RESOURCE *my_res; + mysqli_object *intern = Z_MYSQLI_P(zv); if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) { /* We know that we have a mysqli object, so this failure should be emitted */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", intern->zo.ce->name); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", intern->zo.ce->name->val); return NULL; } mysql = (MY_MYSQL *)(my_res->ptr); @@ -558,6 +518,7 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY_EX("mysqli.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong, max_links, zend_mysqli_globals, mysqli_globals, display_link_numbers) STD_PHP_INI_ENTRY_EX("mysqli.max_persistent", "-1", PHP_INI_SYSTEM, OnUpdateLong, max_persistent, zend_mysqli_globals, mysqli_globals, display_link_numbers) STD_PHP_INI_BOOLEAN("mysqli.allow_persistent", "1", PHP_INI_SYSTEM, OnUpdateLong, allow_persistent, zend_mysqli_globals, mysqli_globals) + STD_PHP_INI_BOOLEAN("mysqli.rollback_on_cached_plink", "0",PHP_INI_SYSTEM, OnUpdateBool, rollback_on_cached_plink, zend_mysqli_globals, mysqli_globals) STD_PHP_INI_ENTRY("mysqli.default_host", NULL, PHP_INI_ALL, OnUpdateString, default_host, zend_mysqli_globals, mysqli_globals) STD_PHP_INI_ENTRY("mysqli.default_user", NULL, PHP_INI_ALL, OnUpdateString, default_user, zend_mysqli_globals, mysqli_globals) STD_PHP_INI_ENTRY("mysqli.default_pw", NULL, PHP_INI_ALL, OnUpdateString, default_pw, zend_mysqli_globals, mysqli_globals) @@ -572,7 +533,6 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ - /* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(mysqli) @@ -597,6 +557,7 @@ static PHP_GINIT_FUNCTION(mysqli) #else mysqli_globals->embedded = 0; #endif + mysqli_globals->rollback_on_cached_plink = FALSE; } /* }}} */ @@ -617,14 +578,26 @@ PHP_MINIT_FUNCTION(mysqli) #endif memcpy(&mysqli_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + mysqli_object_handlers.offset = XtOffsetOf(mysqli_object, zo); + mysqli_object_handlers.free_obj = mysqli_objects_free_storage; mysqli_object_handlers.clone_obj = NULL; mysqli_object_handlers.read_property = mysqli_read_property; mysqli_object_handlers.write_property = mysqli_write_property; mysqli_object_handlers.get_property_ptr_ptr = std_hnd->get_property_ptr_ptr; mysqli_object_handlers.has_property = mysqli_object_has_property; -#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3 +#if PHP_VERSION_ID >= 50300 mysqli_object_handlers.get_debug_info = mysqli_object_get_debug_info; #endif + memcpy(&mysqli_object_driver_handlers, &mysqli_object_handlers, sizeof(zend_object_handlers)); + mysqli_object_driver_handlers.free_obj = mysqli_driver_free_storage; + memcpy(&mysqli_object_link_handlers, &mysqli_object_handlers, sizeof(zend_object_handlers)); + mysqli_object_link_handlers.free_obj = mysqli_link_free_storage; + memcpy(&mysqli_object_result_handlers, &mysqli_object_handlers, sizeof(zend_object_handlers)); + mysqli_object_result_handlers.free_obj = mysqli_result_free_storage; + memcpy(&mysqli_object_stmt_handlers, &mysqli_object_handlers, sizeof(zend_object_handlers)); + mysqli_object_stmt_handlers.free_obj = mysqli_stmt_free_storage; + memcpy(&mysqli_object_warning_handlers, &mysqli_object_handlers, sizeof(zend_object_handlers)); + mysqli_object_warning_handlers.free_obj = mysqli_warning_free_storage; zend_hash_init(&classes, 0, NULL, NULL, 1); @@ -634,9 +607,9 @@ PHP_MINIT_FUNCTION(mysqli) INIT_CLASS_ENTRY(cex, "mysqli_sql_exception", mysqli_exception_methods); #ifdef HAVE_SPL - mysqli_exception_class_entry = zend_register_internal_class_ex(&cex, spl_ce_RuntimeException, NULL TSRMLS_CC); + mysqli_exception_class_entry = zend_register_internal_class_ex(&cex, spl_ce_RuntimeException TSRMLS_CC); #else - mysqli_exception_class_entry = zend_register_internal_class_ex(&cex, zend_exception_get_default(TSRMLS_C), NULL TSRMLS_CC); + mysqli_exception_class_entry = zend_register_internal_class_ex(&cex, zend_exception_get_default(TSRMLS_C) TSRMLS_CC); #endif mysqli_exception_class_entry->ce_flags |= ZEND_ACC_FINAL; zend_declare_property_long(mysqli_exception_class_entry, "code", sizeof("code")-1, 0, ZEND_ACC_PROTECTED TSRMLS_CC); @@ -644,43 +617,81 @@ PHP_MINIT_FUNCTION(mysqli) REGISTER_MYSQLI_CLASS_ENTRY("mysqli_driver", mysqli_driver_class_entry, mysqli_driver_methods); ce = mysqli_driver_class_entry; - zend_hash_init(&mysqli_driver_properties, 0, NULL, NULL, 1); + zend_hash_init(&mysqli_driver_properties, 0, NULL, free_prop_handler, 1); MYSQLI_ADD_PROPERTIES(&mysqli_driver_properties, mysqli_driver_property_entries); - MYSQLI_ADD_PROPERTIES_INFO(ce, mysqli_driver_property_info_entries); - zend_hash_add(&classes, ce->name, ce->name_length+1, &mysqli_driver_properties, sizeof(mysqli_driver_properties), NULL); + zend_declare_property_null(ce, "client_info", sizeof("client_info") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "client_version", sizeof("client_version") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "driver_version", sizeof("driver_version") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "embedded", sizeof("embedded") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "reconnect", sizeof("reconnect") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "report_mode", sizeof("report_mode") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); ce->ce_flags |= ZEND_ACC_FINAL_CLASS; + zend_hash_add_ptr(&classes, ce->name, &mysqli_driver_properties); REGISTER_MYSQLI_CLASS_ENTRY("mysqli", mysqli_link_class_entry, mysqli_link_methods); ce = mysqli_link_class_entry; - zend_hash_init(&mysqli_link_properties, 0, NULL, NULL, 1); + zend_hash_init(&mysqli_link_properties, 0, NULL, free_prop_handler, 1); MYSQLI_ADD_PROPERTIES(&mysqli_link_properties, mysqli_link_property_entries); - MYSQLI_ADD_PROPERTIES_INFO(ce, mysqli_link_property_info_entries); - zend_hash_add(&classes, ce->name, ce->name_length+1, &mysqli_link_properties, sizeof(mysqli_link_properties), NULL); + zend_declare_property_null(ce, "affected_rows", sizeof("affected_rows") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "client_info", sizeof("client_info") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "client_version", sizeof("client_version") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "connect_errno", sizeof("connect_errno") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "connect_error", sizeof("connect_error") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "errno", sizeof("errno") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "error", sizeof("error") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "error_list", sizeof("error_list") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "field_count", sizeof("field_count") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "host_info", sizeof("host_info") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "info", sizeof("info") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "insert_id", sizeof("insert_id") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "server_info", sizeof("server_info") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "server_version", sizeof("server_version") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "stat", sizeof("stat") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "sqlstate", sizeof("sqlstate") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "protocol_version", sizeof("protocol_version") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "thread_id", sizeof("thread_id") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "warning_count", sizeof("warning_count") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_hash_add_ptr(&classes, ce->name, &mysqli_link_properties); REGISTER_MYSQLI_CLASS_ENTRY("mysqli_warning", mysqli_warning_class_entry, mysqli_warning_methods); ce = mysqli_warning_class_entry; ce->ce_flags |= ZEND_ACC_FINAL_CLASS | ZEND_ACC_PROTECTED; - zend_hash_init(&mysqli_warning_properties, 0, NULL, NULL, 1); + zend_hash_init(&mysqli_warning_properties, 0, NULL, free_prop_handler, 1); MYSQLI_ADD_PROPERTIES(&mysqli_warning_properties, mysqli_warning_property_entries); - MYSQLI_ADD_PROPERTIES_INFO(ce, mysqli_warning_property_info_entries); - zend_hash_add(&classes, ce->name, ce->name_length+1, &mysqli_warning_properties, sizeof(mysqli_warning_properties), NULL); + zend_declare_property_null(ce, "message", sizeof("message") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "sqlstate", sizeof("sqlstate") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "errno", sizeof("errno") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_hash_add_ptr(&classes, ce->name, &mysqli_warning_properties); REGISTER_MYSQLI_CLASS_ENTRY("mysqli_result", mysqli_result_class_entry, mysqli_result_methods); ce = mysqli_result_class_entry; - zend_hash_init(&mysqli_result_properties, 0, NULL, NULL, 1); + zend_hash_init(&mysqli_result_properties, 0, NULL, free_prop_handler, 1); MYSQLI_ADD_PROPERTIES(&mysqli_result_properties, mysqli_result_property_entries); - MYSQLI_ADD_PROPERTIES_INFO(ce, mysqli_result_property_info_entries); + zend_declare_property_null(ce, "current_field", sizeof("current_field") - 1,ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "field_count", sizeof("field_count") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "lengths", sizeof("lengths") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "num_rows", sizeof("num_rows") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "type", sizeof("type") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); mysqli_result_class_entry->get_iterator = php_mysqli_result_get_iterator; mysqli_result_class_entry->iterator_funcs.funcs = &php_mysqli_result_iterator_funcs; zend_class_implements(mysqli_result_class_entry TSRMLS_CC, 1, zend_ce_traversable); - zend_hash_add(&classes, ce->name, ce->name_length+1, &mysqli_result_properties, sizeof(mysqli_result_properties), NULL); + zend_hash_add_ptr(&classes, ce->name, &mysqli_result_properties); REGISTER_MYSQLI_CLASS_ENTRY("mysqli_stmt", mysqli_stmt_class_entry, mysqli_stmt_methods); ce = mysqli_stmt_class_entry; - zend_hash_init(&mysqli_stmt_properties, 0, NULL, NULL, 1); + zend_hash_init(&mysqli_stmt_properties, 0, NULL, free_prop_handler, 1); MYSQLI_ADD_PROPERTIES(&mysqli_stmt_properties, mysqli_stmt_property_entries); - MYSQLI_ADD_PROPERTIES_INFO(ce, mysqli_stmt_property_info_entries); - zend_hash_add(&classes, ce->name, ce->name_length+1, &mysqli_stmt_properties, sizeof(mysqli_stmt_properties), NULL); + zend_declare_property_null(ce, "affected_rows", sizeof("affected_rows") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "insert_id", sizeof("insert_id") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "num_rows", sizeof("num_rows") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "param_count", sizeof("param_count") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "field_count", sizeof("field_count") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "errno", sizeof("errno") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "error", sizeof("error") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "error_list", sizeof("error_list") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "sqlstate", sizeof("sqlstate") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(ce, "id", sizeof("id") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_hash_add_ptr(&classes, ce->name, &mysqli_stmt_properties); /* mysqli_options */ REGISTER_LONG_CONSTANT("MYSQLI_READ_DEFAULT_GROUP", MYSQL_READ_DEFAULT_GROUP, CONST_CS | CONST_PERSISTENT); @@ -710,12 +721,17 @@ PHP_MINIT_FUNCTION(mysqli) REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_IGNORE_SPACE", CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_NO_SCHEMA", CLIENT_NO_SCHEMA, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_FOUND_ROWS", CLIENT_FOUND_ROWS, CONST_CS | CONST_PERSISTENT); +#if (MYSQL_VERSION_ID >= 50611 && defined(CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS)) || defined(MYSQLI_USE_MYSQLND) + REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS", CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("MYSQLI_OPT_CAN_HANDLE_EXPIRED_PASSWORDS", MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, CONST_CS | CONST_PERSISTENT); +#endif /* for mysqli_query */ REGISTER_LONG_CONSTANT("MYSQLI_STORE_RESULT", MYSQLI_STORE_RESULT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_USE_RESULT", MYSQLI_USE_RESULT, CONST_CS | CONST_PERSISTENT); #if defined (MYSQLI_USE_MYSQLND) REGISTER_LONG_CONSTANT("MYSQLI_ASYNC", MYSQLI_ASYNC, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("MYSQLI_STORE_RESULT_COPY_DATA", MYSQLI_STORE_RESULT_COPY_DATA, CONST_CS | CONST_PERSISTENT); #endif /* for mysqli_fetch_assoc */ @@ -842,9 +858,6 @@ PHP_MINIT_FUNCTION(mysqli) REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_BACKUP_LOG", REFRESH_BACKUP_LOG, CONST_CS | CONST_PERSISTENT); #endif -#if (MYSQL_VERSION_ID >= 50611 && defined(CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS)) || defined(MYSQLI_USE_MYSQLND) - REGISTER_LONG_CONSTANT("MYSQLI_OPT_CAN_HANDLE_EXPIRED_PASSWORDS", MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, CONST_CS | CONST_PERSISTENT); -#endif REGISTER_LONG_CONSTANT("MYSQLI_TRANS_START_WITH_CONSISTENT_SNAPSHOT", TRANS_START_WITH_CONSISTENT_SNAPSHOT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_TRANS_START_READ_WRITE", TRANS_START_READ_WRITE, CONST_CS | CONST_PERSISTENT); @@ -871,7 +884,7 @@ PHP_MSHUTDOWN_FUNCTION(mysqli) #ifndef MYSQLI_USE_MYSQLND #if MYSQL_VERSION_ID >= 40000 #ifdef PHP_WIN32 - unsigned long client_ver = mysql_get_client_version(); + zend_ulong client_ver = mysql_get_client_version(); /* Can't call mysql_server_end() multiple times prior to 5.0.46 on Windows. PHP bug#41350 MySQL bug#25621 @@ -963,11 +976,11 @@ PHP_MINFO_FUNCTION(mysqli) php_info_print_table_start(); php_info_print_table_header(2, "MysqlI Support", "enabled"); php_info_print_table_row(2, "Client API library version", mysql_get_client_info()); - snprintf(buf, sizeof(buf), "%ld", MyG(num_active_persistent)); + snprintf(buf, sizeof(buf), ZEND_LONG_FMT, MyG(num_active_persistent)); php_info_print_table_row(2, "Active Persistent Links", buf); - snprintf(buf, sizeof(buf), "%ld", MyG(num_inactive_persistent)); + snprintf(buf, sizeof(buf), ZEND_LONG_FMT, MyG(num_inactive_persistent)); php_info_print_table_row(2, "Inactive Persistent Links", buf); - snprintf(buf, sizeof(buf), "%ld", MyG(num_links)); + snprintf(buf, sizeof(buf), ZEND_LONG_FMT, MyG(num_links)); php_info_print_table_row(2, "Active Links", buf); #if !defined(MYSQLI_USE_MYSQLND) php_info_print_table_row(2, "Client API header version", MYSQL_SERVER_VERSION); @@ -982,7 +995,7 @@ PHP_MINFO_FUNCTION(mysqli) /* Dependancies */ static const zend_module_dep mysqli_deps[] = { -#if defined(HAVE_SPL) && ((PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1)) +#if defined(HAVE_SPL) && (PHP_VERSION_ID >= 50100) ZEND_MOD_REQUIRED("spl") #endif #if defined(MYSQLI_USE_MYSQLND) @@ -1034,7 +1047,7 @@ PHP_FUNCTION(mysqli_stmt_construct) MY_STMT *stmt; MYSQLI_RESOURCE *mysqli_resource; char *statement; - int statement_len; + size_t statement_len; switch (ZEND_NUM_ARGS()) { @@ -1042,7 +1055,7 @@ PHP_FUNCTION(mysqli_stmt_construct) if (zend_parse_parameters(1 TSRMLS_CC, "O", &mysql_link, mysqli_link_class_entry)==FAILURE) { return; } - MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID); + MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); stmt = (MY_STMT *)ecalloc(1,sizeof(MY_STMT)); @@ -1052,7 +1065,7 @@ PHP_FUNCTION(mysqli_stmt_construct) if (zend_parse_parameters(2 TSRMLS_CC, "Os", &mysql_link, mysqli_link_class_entry, &statement, &statement_len)==FAILURE) { return; } - MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID); + MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); stmt = (MY_STMT *)ecalloc(1,sizeof(MY_STMT)); @@ -1069,12 +1082,15 @@ PHP_FUNCTION(mysqli_stmt_construct) efree(stmt); RETURN_FALSE; } +#ifndef MYSQLI_USE_MYSQLND + ZVAL_COPY(&stmt->link_handle, mysql_link); +#endif mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE)); mysqli_resource->ptr = (void *)stmt; mysqli_resource->status = (ZEND_NUM_ARGS() == 1) ? MYSQLI_STATUS_INITIALIZED : MYSQLI_STATUS_VALID; - ((mysqli_object *) zend_object_store_get_object(getThis() TSRMLS_CC))->ptr = mysqli_resource; + MYSQLI_REGISTER_RESOURCE_EX(mysqli_resource, getThis()); } /* }}} */ @@ -1089,7 +1105,7 @@ PHP_FUNCTION(mysqli_result_construct) MYSQL_RES *result = NULL; zval *mysql_link; MYSQLI_RESOURCE *mysqli_resource; - long resmode = MYSQLI_STORE_RESULT; + zend_long resmode = MYSQLI_STORE_RESULT; switch (ZEND_NUM_ARGS()) { case 1: @@ -1106,7 +1122,7 @@ PHP_FUNCTION(mysqli_result_construct) WRONG_PARAM_COUNT; } - MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID); + MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); switch (resmode) { case MYSQLI_STORE_RESULT: @@ -1127,21 +1143,19 @@ PHP_FUNCTION(mysqli_result_construct) mysqli_resource->ptr = (void *)result; mysqli_resource->status = MYSQLI_STATUS_VALID; - ((mysqli_object *) zend_object_store_get_object(getThis() TSRMLS_CC))->ptr = mysqli_resource; - + MYSQLI_REGISTER_RESOURCE_EX(mysqli_resource, getThis()); } /* }}} */ - /* {{{ php_mysqli_fetch_into_hash_aux */ -void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, long fetchtype TSRMLS_DC) +void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, zend_long fetchtype TSRMLS_DC) { #if !defined(MYSQLI_USE_MYSQLND) MYSQL_ROW row; unsigned int i; MYSQL_FIELD *fields; - unsigned long *field_len; + zend_ulong *field_len; if (!(row = mysql_fetch_row(result))) { RETURN_NULL(); @@ -1156,9 +1170,7 @@ void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, long for (i = 0; i < mysql_num_fields(result); i++) { if (row[i]) { - zval *res; - - MAKE_STD_ZVAL(res); + zval res; #if MYSQL_VERSION_ID > 50002 if (mysql_fetch_field_direct(result, i)->type == MYSQL_TYPE_BIT) { @@ -1179,7 +1191,7 @@ void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, long * use MYSQLI_LL_SPEC. */ snprintf(tmp, sizeof(tmp), (mysql_fetch_field_direct(result, i)->flags & UNSIGNED_FLAG)? MYSQLI_LLU_SPEC : MYSQLI_LL_SPEC, llval); - ZVAL_STRING(res, tmp, 1); + ZVAL_STRING(&res, tmp); } else #endif { @@ -1187,24 +1199,23 @@ void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, long #if PHP_API_VERSION < 20100412 /* check if we need magic quotes */ if (PG(magic_quotes_runtime)) { - Z_TYPE_P(res) = IS_STRING; - Z_STRVAL_P(res) = php_addslashes(row[i], field_len[i], &Z_STRLEN_P(res), 0 TSRMLS_CC); + ZVAL_STR(&res, php_addslashes(row[i], field_len[i], 0 TSRMLS_CC)); } else { #endif - ZVAL_STRINGL(res, row[i], field_len[i], 1); + ZVAL_STRINGL(&res, row[i], field_len[i]); #if PHP_API_VERSION < 20100412 } #endif } if (fetchtype & MYSQLI_NUM) { - add_index_zval(return_value, i, res); + add_index_zval(return_value, i, &res); } if (fetchtype & MYSQLI_ASSOC) { - if (fetchtype & MYSQLI_NUM) { - Z_ADDREF_P(res); + if (fetchtype & MYSQLI_NUM && Z_REFCOUNTED(res)) { + Z_ADDREF(res); } - add_assoc_zval(return_value, fields[i].name, res); + add_assoc_zval(return_value, fields[i].name, &res); } } else { if (fetchtype & MYSQLI_NUM) { @@ -1221,31 +1232,29 @@ void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, long } /* }}} */ - /* {{{ php_mysqli_fetch_into_hash */ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags, int into_object) { MYSQL_RES *result; zval *mysql_result; - long fetchtype; + zend_long fetchtype; zval *ctor_params = NULL; zend_class_entry *ce = NULL; if (into_object) { - char *class_name; - int class_name_len; + zend_string *class_name = NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|sz", &mysql_result, mysqli_result_class_entry, &class_name, &class_name_len, &ctor_params) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|Sz", &mysql_result, mysqli_result_class_entry, &class_name, &ctor_params) == FAILURE) { return; } - if (ZEND_NUM_ARGS() < (getThis() ? 1 : 2)) { + if (class_name == NULL) { ce = zend_standard_class_def; } else { - ce = zend_fetch_class(class_name, class_name_len, ZEND_FETCH_CLASS_AUTO TSRMLS_CC); + ce = zend_fetch_class(class_name, ZEND_FETCH_CLASS_AUTO TSRMLS_CC); } if (!ce) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not find class '%s'", class_name); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not find class '%s'", class_name->val); return; } fetchtype = MYSQLI_ASSOC; @@ -1262,7 +1271,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags } } } - MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result", MYSQLI_STATUS_VALID); + MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID); if (fetchtype < MYSQLI_ASSOC || fetchtype > MYSQLI_BOTH) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "The result type should be either MYSQLI_NUM, MYSQLI_ASSOC or MYSQLI_BOTH"); @@ -1272,34 +1281,35 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags php_mysqli_fetch_into_hash_aux(return_value, result, fetchtype TSRMLS_CC); if (into_object && Z_TYPE_P(return_value) == IS_ARRAY) { - zval dataset = *return_value; + zval dataset, retval; zend_fcall_info fci; zend_fcall_info_cache fcc; - zval *retval_ptr; + + ZVAL_COPY_VALUE(&dataset, return_value); object_and_properties_init(return_value, ce, NULL); - zend_merge_properties(return_value, Z_ARRVAL(dataset), 1 TSRMLS_CC); + if (!ce->default_properties_count && !ce->__set) { + ALLOC_HASHTABLE(Z_OBJ_P(return_value)->properties); + *Z_OBJ_P(return_value)->properties = *Z_ARRVAL(dataset); + efree(Z_ARR(dataset)); + } else { + zend_merge_properties(return_value, Z_ARRVAL(dataset) TSRMLS_CC); + zval_ptr_dtor(&dataset); + } if (ce->constructor) { fci.size = sizeof(fci); fci.function_table = &ce->function_table; - fci.function_name = NULL; + ZVAL_UNDEF(&fci.function_name); fci.symbol_table = NULL; - fci.object_ptr = return_value; - fci.retval_ptr_ptr = &retval_ptr; + fci.object = Z_OBJ_P(return_value); + fci.retval = &retval; + fci.params = NULL; + fci.param_count = 0; + fci.no_separation = 1; + if (ctor_params && Z_TYPE_P(ctor_params) != IS_NULL) { - if (Z_TYPE_P(ctor_params) == IS_ARRAY) { - HashTable *params_ht = Z_ARRVAL_P(ctor_params); - Bucket *p; - - fci.param_count = 0; - fci.params = safe_emalloc(sizeof(zval*), params_ht->nNumOfElements, 0); - p = params_ht->pListHead; - while (p != NULL) { - fci.params[fci.param_count++] = (zval**)p->pData; - p = p->pListNext; - } - } else { + if (zend_fcall_info_args(&fci, ctor_params TSRMLS_CC) == FAILURE) { /* Two problems why we throw exceptions here: PHP is typeless * and hence passing one argument that's not an array could be * by mistake and the other way round is possible, too. The @@ -1309,30 +1319,24 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags zend_throw_exception(zend_exception_get_default(TSRMLS_C), "Parameter ctor_params must be an array", 0 TSRMLS_CC); return; } - } else { - fci.param_count = 0; - fci.params = NULL; } - fci.no_separation = 1; fcc.initialized = 1; fcc.function_handler = ce->constructor; fcc.calling_scope = EG(scope); fcc.called_scope = Z_OBJCE_P(return_value); - fcc.object_ptr = return_value; + fcc.object = Z_OBJ_P(return_value); if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) { - zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "Could not execute %s::%s()", ce->name, ce->constructor->common.function_name); + zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "Could not execute %s::%s()", ce->name->val, ce->constructor->common.function_name->val); } else { - if (retval_ptr) { - zval_ptr_dtor(&retval_ptr); - } + zval_ptr_dtor(&retval); } if (fci.params) { efree(fci.params); } } else if (ctor_params) { - zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "Class %s does not have a constructor hence you cannot use ctor_params", ce->name); + zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "Class %s does not have a constructor hence you cannot use ctor_params", ce->name->val); } } } |