diff options
| -rw-r--r-- | Zend/zend_ast.h | 2 | ||||
| -rw-r--r-- | Zend/zend_hash.h | 7 | ||||
| -rw-r--r-- | Zend/zend_string.h | 2 | ||||
| -rw-r--r-- | Zend/zend_types.h | 11 | ||||
| -rw-r--r-- | ext/phar/phar_object.c | 2 | ||||
| -rw-r--r-- | ext/spl/php_spl.c | 312 | ||||
| -rw-r--r-- | ext/spl/php_spl.h | 5 | ||||
| -rw-r--r-- | ext/spl/spl_engine.c | 11 | ||||
| -rw-r--r-- | ext/spl/spl_engine.h | 16 | ||||
| -rw-r--r-- | ext/spl/spl_functions.c | 10 | ||||
| -rw-r--r-- | ext/spl/spl_functions.h | 2 | ||||
| -rw-r--r-- | ext/spl/spl_iterators.c | 12 |
12 files changed, 192 insertions, 200 deletions
diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 0f28253895..cac3a54dd4 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -22,8 +22,6 @@ #ifndef ZEND_AST_H #define ZEND_AST_H -typedef struct _zend_ast zend_ast; - #include "zend.h" typedef enum _zend_ast_kind { diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h index 64461545c8..a3137195e1 100644 --- a/Zend/zend_hash.h +++ b/Zend/zend_hash.h @@ -47,11 +47,6 @@ #define HASH_MASK_CONSISTENCY 0x60 -typedef int (*compare_func_t)(const void *, const void * TSRMLS_DC); -typedef void (*sort_func_t)(void *, size_t, size_t, compare_func_t TSRMLS_DC); -typedef void (*dtor_func_t)(zval *pDest); -typedef void (*copy_ctor_func_t)(zval *pElement); - typedef struct _zend_hash_key { ulong h; zend_string *key; @@ -446,7 +441,7 @@ static inline void *zend_hash_get_current_data_ptr_ex(HashTable *ht, HashPositio { zval *zv; - zv = zend_hash_get_current_data_ptr_ex(ht, pos); + zv = zend_hash_get_current_data_ex(ht, pos); return zv ? Z_PTR_P(zv) : NULL; } diff --git a/Zend/zend_string.h b/Zend/zend_string.h index ca13e8aec3..dcbb9fce3e 100644 --- a/Zend/zend_string.h +++ b/Zend/zend_string.h @@ -109,7 +109,7 @@ static zend_always_inline zend_string *zend_str_init(const char *str, int len, i { zend_string *ret = STR_ALLOC(len, persistent); - memcpy(ret, str, len + 1); + memcpy(ret->val, str, len + 1); return ret; } diff --git a/Zend/zend_types.h b/Zend/zend_types.h index 1f1c621882..0619bad747 100644 --- a/Zend/zend_types.h +++ b/Zend/zend_types.h @@ -66,7 +66,10 @@ typedef struct _zend_ast_ref zend_ast_ref; typedef struct _zend_ast zend_ast; typedef struct _zend_str_offset zend_str_offset; -typedef void (*dtor_func_t)(zval *zv); +typedef int (*compare_func_t)(const void *, const void * TSRMLS_DC); +typedef void (*sort_func_t)(void *, size_t, size_t, compare_func_t TSRMLS_DC); +typedef void (*dtor_func_t)(zval *pDest); +typedef void (*copy_ctor_func_t)(zval *pElement); typedef union _zend_value { long lval; /* long value */ @@ -262,15 +265,15 @@ struct _zend_ast_ref { #define Z_OBJ(zval) (zval).value.obj #define Z_OBJ_P(zval_p) Z_OBJ(*(zval_p)) -#define Z_OBJ(zval) (zval).value.obj -#define Z_OBJ_P(zval_p) Z_OBJ(*(zval_p)) - #define Z_OBJ_HT(zval) Z_OBJ(zval)->handlers #define Z_OBJ_HT_P(zval_p) Z_OBJ_HT(*(zval_p)) #define Z_OBJ_HANDLER(zval, hf) Z_OBJ_HT((zval))->hf #define Z_OBJ_HANDLER_P(zv_p, hf) Z_OBJ_HANDLER(*(zv_p), hf) +#define Z_OBJ_HANDLE(zval) (Z_OBJ((zval)))->handle +#define Z_OBJ_HANDLE_P(zval_p) Z_OBJ_HANDLE(*(zval_p)) + #define Z_OBJCE(zval) zend_get_class_entry(&(zval) TSRMLS_CC) #define Z_OBJCE_P(zval_p) Z_OBJCE(*(zval_p)) diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 24508440ac..9af857bf93 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -3606,7 +3606,7 @@ PHP_METHOD(Phar, offsetGet) fname_len = spprintf(&fname, 0, "phar://%s/%s", phar_obj->arc.archive->fname, fname); MAKE_STD_ZVAL(zfname); ZVAL_STRINGL(zfname, fname, fname_len, 0); - spl_instantiate_arg_ex1(phar_obj->spl.info_class, &return_value, 0, zfname TSRMLS_CC); + spl_instantiate_arg_ex1(phar_obj->spl.info_class, return_value, zfname TSRMLS_CC); zval_ptr_dtor(&zfname); } } diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index de787ae7b6..09c1e8f4a9 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -56,35 +56,30 @@ ZEND_DECLARE_MODULE_GLOBALS(spl) static PHP_GINIT_FUNCTION(spl) { spl_globals->autoload_extensions = NULL; - spl_globals->autoload_extensions_len = 0; spl_globals->autoload_functions = NULL; spl_globals->autoload_running = 0; } /* }}} */ -static zend_class_entry * spl_find_ce_by_name(char *name, int len, zend_bool autoload TSRMLS_DC) +static zend_class_entry * spl_find_ce_by_name(zend_string *name, zend_bool autoload TSRMLS_DC) { - zend_class_entry **ce; - int found; + zend_class_entry *ce; if (!autoload) { - char *lc_name; - ALLOCA_FLAG(use_heap) - - lc_name = do_alloca(len + 1, use_heap); - zend_str_tolower_copy(lc_name, name, len); + zend_string *lc_name = STR_ALLOC(name->len, 0); + zend_str_tolower_copy(lc_name->val, name->val, name->len); - found = zend_hash_find(EG(class_table), lc_name, len +1, (void **) &ce); - free_alloca(lc_name, use_heap); + ce = zend_hash_find_ptr(EG(class_table), lc_name); + STR_FREE(lc_name); } else { - found = zend_lookup_class(name, len, &ce TSRMLS_CC); + ce = zend_lookup_class(name TSRMLS_CC); } - if (found != SUCCESS) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Class %s does not exist%s", name, autoload ? " and could not be loaded" : ""); + if (ce == NULL) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Class %s does not exist%s", name->val, autoload ? " and could not be loaded" : ""); return NULL; } - return *ce; + return ce; } /* {{{ proto array class_parents(object instance [, boolean autoload = true]) @@ -105,7 +100,7 @@ PHP_FUNCTION(class_parents) } if (Z_TYPE_P(obj) == IS_STRING) { - if (NULL == (ce = spl_find_ce_by_name(Z_STRVAL_P(obj), Z_STRLEN_P(obj), autoload TSRMLS_CC))) { + if (NULL == (ce = spl_find_ce_by_name(Z_STR_P(obj), autoload TSRMLS_CC))) { RETURN_FALSE; } } else { @@ -138,7 +133,7 @@ PHP_FUNCTION(class_implements) } if (Z_TYPE_P(obj) == IS_STRING) { - if (NULL == (ce = spl_find_ce_by_name(Z_STRVAL_P(obj), Z_STRLEN_P(obj), autoload TSRMLS_CC))) { + if (NULL == (ce = spl_find_ce_by_name(Z_STR_P(obj), autoload TSRMLS_CC))) { RETURN_FALSE; } } else { @@ -167,7 +162,7 @@ PHP_FUNCTION(class_uses) } if (Z_TYPE_P(obj) == IS_STRING) { - if (NULL == (ce = spl_find_ce_by_name(Z_STRVAL_P(obj), Z_STRLEN_P(obj), autoload TSRMLS_CC))) { + if (NULL == (ce = spl_find_ce_by_name(Z_STR_P(obj), autoload TSRMLS_CC))) { RETURN_FALSE; } } else { @@ -250,17 +245,17 @@ PHP_FUNCTION(spl_classes) } /* }}} */ -static int spl_autoload(const char *class_name, const char * lc_name, int class_name_len, const char * file_extension TSRMLS_DC) /* {{{ */ +static int spl_autoload(zend_string *class_name, zend_string *lc_name, const char *ext, int ext_len TSRMLS_DC) /* {{{ */ { char *class_file; int class_file_len; - int dummy = 1; + zval dummy; zend_file_handle file_handle; zend_op_array *new_op_array; zval *result = NULL; int ret; - class_file_len = spprintf(&class_file, 0, "%s%s", lc_name, file_extension); + class_file_len = spprintf(&class_file, 0, "%s%.*s", lc_name->val, ext_len, ext); #if DEFAULT_SLASH != '\\' { @@ -276,18 +271,22 @@ static int spl_autoload(const char *class_name, const char * lc_name, int class_ ret = php_stream_open_for_zend_ex(class_file, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE TSRMLS_CC); if (ret == SUCCESS) { + zend_string *opened_path; if (!file_handle.opened_path) { file_handle.opened_path = estrndup(class_file, class_file_len); } - if (zend_hash_add(&EG(included_files), file_handle.opened_path, strlen(file_handle.opened_path)+1, (void *)&dummy, sizeof(int), NULL)==SUCCESS) { + opened_path = STR_INIT(file_handle.opened_path, strlen(file_handle.opened_path), 0); + ZVAL_NULL(&dummy); + if (zend_hash_add(&EG(included_files), opened_path, &dummy)) { new_op_array = zend_compile_file(&file_handle, ZEND_REQUIRE TSRMLS_CC); zend_destroy_file_handle(&file_handle TSRMLS_CC); } else { new_op_array = NULL; zend_file_handle_dtor(&file_handle TSRMLS_CC); } + STR_FREE(opened_path); if (new_op_array) { - EG(return_value_ptr_ptr) = &result; +//!!! EG(return_value_ptr_ptr) = &result; EG(active_op_array) = new_op_array; if (!EG(active_symbol_table)) { zend_rebuild_symbol_table(TSRMLS_C); @@ -298,13 +297,14 @@ static int spl_autoload(const char *class_name, const char * lc_name, int class_ destroy_op_array(new_op_array TSRMLS_CC); efree(new_op_array); if (!EG(exception)) { - if (EG(return_value_ptr_ptr)) { +/*!!! if (EG(return_value_ptr_ptr)) { zval_ptr_dtor(EG(return_value_ptr_ptr)); } +*/ } efree(class_file); - return zend_hash_exists(EG(class_table), (char*)lc_name, class_name_len+1); + return zend_hash_exists(EG(class_table), lc_name); } } efree(class_file); @@ -315,41 +315,45 @@ static int spl_autoload(const char *class_name, const char * lc_name, int class_ Default implementation for __autoload() */ PHP_FUNCTION(spl_autoload) { - char *class_name, *lc_name, *file_exts = SPL_G(autoload_extensions); - int class_name_len, file_exts_len = SPL_G(autoload_extensions_len), found = 0; - char *copy, *pos1, *pos2; - zval **original_return_value = EG(return_value_ptr_ptr); + int found = 0, pos_len; + char *pos, *pos1; + zend_string *class_name, *lc_name, *file_exts = SPL_G(autoload_extensions); +//!!! zval **original_return_value = EG(return_value_ptr_ptr); zend_op **original_opline_ptr = EG(opline_ptr); zend_op_array *original_active_op_array = EG(active_op_array); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &class_name, &class_name_len, &file_exts, &file_exts_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|S", &class_name, &file_exts) == FAILURE) { RETURN_FALSE; } if (file_exts == NULL) { /* autoload_extensions is not intialzed, set to defaults */ - copy = pos1 = estrndup(SPL_DEFAULT_FILE_EXTENSIONS, sizeof(SPL_DEFAULT_FILE_EXTENSIONS)-1); + pos = SPL_DEFAULT_FILE_EXTENSIONS; + pos_len = sizeof(SPL_DEFAULT_FILE_EXTENSIONS) - 1; } else { - copy = pos1 = estrndup(file_exts, file_exts_len); + pos = file_exts->val; + pos_len = file_exts->len; } - lc_name = zend_str_tolower_dup(class_name, class_name_len); - while(pos1 && *pos1 && !EG(exception)) { - EG(return_value_ptr_ptr) = original_return_value; + + lc_name = STR_ALLOC(class_name->len, 0); + zend_str_tolower_copy(lc_name->val, class_name->val, class_name->len); + while (pos && *pos && !EG(exception)) { + //!!! EG(return_value_ptr_ptr) = original_return_value; EG(opline_ptr) = original_opline_ptr; EG(active_op_array) = original_active_op_array; - pos2 = strchr(pos1, ','); - if (pos2) *pos2 = '\0'; - if (spl_autoload(class_name, lc_name, class_name_len, pos1 TSRMLS_CC)) { + pos1 = strchr(pos, ','); + if (pos1) { + pos_len = pos1 - pos; + } + if (spl_autoload(class_name, lc_name, pos, pos_len TSRMLS_CC)) { found = 1; break; /* loaded */ } - pos1 = pos2 ? pos2 + 1 : NULL; - } - efree(lc_name); - if (copy) { - efree(copy); + pos = pos1 ? pos1 + 1 : NULL; + pos_len = pos1 ? pos1 - pos : pos_len; } + STR_FREE(lc_name); - EG(return_value_ptr_ptr) = original_return_value; +//!!! EG(return_value_ptr_ptr) = original_return_value; EG(opline_ptr) = original_opline_ptr; EG(active_op_array) = original_active_op_array; @@ -370,24 +374,22 @@ PHP_FUNCTION(spl_autoload) Register and return default file extensions for spl_autoload */ PHP_FUNCTION(spl_autoload_extensions) { - char *file_exts = NULL; - int file_exts_len; + zend_string *file_exts = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &file_exts, &file_exts_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|S", &file_exts) == FAILURE) { return; } if (file_exts) { if (SPL_G(autoload_extensions)) { - efree(SPL_G(autoload_extensions)); + STR_REFCOUNT(SPL_G(autoload_extensions)); } - SPL_G(autoload_extensions) = estrndup(file_exts, file_exts_len); - SPL_G(autoload_extensions_len) = file_exts_len; + SPL_G(autoload_extensions) = STR_DUP(file_exts, 0); } if (SPL_G(autoload_extensions) == NULL) { - RETURN_STRINGL(SPL_DEFAULT_FILE_EXTENSIONS, sizeof(SPL_DEFAULT_FILE_EXTENSIONS) - 1, 1); + RETURN_STRINGL(SPL_DEFAULT_FILE_EXTENSIONS, sizeof(SPL_DEFAULT_FILE_EXTENSIONS) - 1); } else { - RETURN_STRINGL(SPL_G(autoload_extensions), SPL_G(autoload_extensions_len), 1); + RETURN_STR(SPL_G(autoload_extensions)); } } /* }}} */ @@ -401,10 +403,10 @@ typedef struct { static void autoload_func_info_dtor(autoload_func_info *alfi) { if (alfi->obj) { - zval_ptr_dtor(&alfi->obj); + zval_ptr_dtor(alfi->obj); } if (alfi->closure) { - zval_ptr_dtor(&alfi->closure); + zval_ptr_dtor(alfi->closure); } } @@ -412,40 +414,38 @@ static void autoload_func_info_dtor(autoload_func_info *alfi) Try all registerd autoload function to load the requested class */ PHP_FUNCTION(spl_autoload_call) { - zval *class_name, *retval = NULL; - int class_name_len; - char *func_name, *lc_name; - uint func_name_len; ulong dummy; + zval *class_name, *retval = NULL; + zend_string *lc_name, *func_name; HashPosition function_pos; autoload_func_info *alfi; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &class_name) == FAILURE || Z_TYPE_P(class_name) != IS_STRING) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &class_name) == FAILURE || Z_TYPE_P(class_name) != IS_STRING) { return; } if (SPL_G(autoload_functions)) { int l_autoload_running = SPL_G(autoload_running); SPL_G(autoload_running) = 1; - class_name_len = Z_STRLEN_P(class_name); - lc_name = zend_str_tolower_dup(Z_STRVAL_P(class_name), class_name_len); + lc_name = STR_ALLOC(Z_STRLEN_P(class_name), 0); + zend_str_tolower_copy(lc_name->val, Z_STRVAL_P(class_name), Z_STRLEN_P(class_name)); zend_hash_internal_pointer_reset_ex(SPL_G(autoload_functions), &function_pos); while(zend_hash_has_more_elements_ex(SPL_G(autoload_functions), &function_pos) == SUCCESS) { - zend_hash_get_current_key_ex(SPL_G(autoload_functions), &func_name, &func_name_len, &dummy, 0, &function_pos); - zend_hash_get_current_data_ex(SPL_G(autoload_functions), (void **) &alfi, &function_pos); - zend_call_method(alfi->obj ? &alfi->obj : NULL, alfi->ce, &alfi->func_ptr, func_name, func_name_len, &retval, 1, class_name, NULL TSRMLS_CC); + zend_hash_get_current_key_ex(SPL_G(autoload_functions), &func_name, &dummy, 0, &function_pos); + alfi = zend_hash_get_current_data_ptr_ex(SPL_G(autoload_functions), &function_pos); + zend_call_method(alfi->obj, alfi->ce, &alfi->func_ptr, func_name->val, func_name->len, retval, 1, class_name, NULL TSRMLS_CC); zend_exception_save(TSRMLS_C); if (retval) { - zval_ptr_dtor(&retval); + zval_ptr_dtor(retval); retval = NULL; } - if (zend_hash_exists(EG(class_table), lc_name, class_name_len + 1)) { + if (zend_hash_exists(EG(class_table), lc_name)) { break; } zend_hash_move_forward_ex(SPL_G(autoload_functions), &function_pos); } zend_exception_restore(TSRMLS_C); - efree(lc_name); + STR_FREE(lc_name); SPL_G(autoload_running) = l_autoload_running; } else { /* do not use or overwrite &EG(autoload_func) here */ @@ -453,24 +453,26 @@ PHP_FUNCTION(spl_autoload_call) } } /* }}} */ -#define HT_MOVE_TAIL_TO_HEAD(ht) \ - do { \ - uint first = 0; \ - uint last = (ht)->nNumUsed; \ - while (first < last) { \ - if ((ht)->arData[first].xData) break; \ - first++; \ - } \ - while (last > first) { \ - last--; \ - if ((ht)->arData[last].xData) break; \ - } \ - if (first != last) { \ - Bucket tmp = (ht)->arData[first]; \ - (ht)->arData[first] = (ht)->arData[last]; \ - (ht)->arData[last] = tmp; \ - zend_hash_rehash(ht); \ - } \ +#define HT_MOVE_TAIL_TO_HEAD(ht) \ + do { \ + uint first = 0; \ + uint last = (ht)->nNumUsed; \ + while (first < last) { \ + if (Z_TYPE((ht)->arData[first].val) != IS_UNDEF) \ + break; \ + first++; \ + } \ + while (last > first) { \ + last--; \ + if (Z_TYPE((ht)->arData[last].val) != IS_UNDEF) \ + break; \ + } \ + if (first != last) { \ + Bucket tmp = (ht)->arData[first]; \ + (ht)->arData[first] = (ht)->arData[last]; \ + (ht)->arData[last] = tmp; \ + zend_hash_rehash(ht); \ + } \ } while (0) /* {{{ proto bool spl_autoload_register([mixed autoload_function = "spl_autoload" [, throw = true [, prepend]]]) @@ -479,7 +481,7 @@ PHP_FUNCTION(spl_autoload_register) { char *func_name, *error = NULL; int func_name_len; - char *lc_name = NULL; + zend_string *lc_name; zval *zcallable = NULL; zend_bool do_throw = 1; zend_bool prepend = 0; @@ -493,17 +495,6 @@ PHP_FUNCTION(spl_autoload_register) } if (ZEND_NUM_ARGS()) { - if (Z_TYPE_P(zcallable) == IS_STRING) { - if (Z_STRLEN_P(zcallable) == sizeof("spl_autoload_call") - 1) { - if (!zend_binary_strcasecmp(Z_STRVAL_P(zcallable), sizeof("spl_autoload_call"), "spl_autoload_call", sizeof("spl_autoload_call"))) { - if (do_throw) { - zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Function spl_autoload_call() cannot be registered"); - } - RETURN_FALSE; - } - } - } - if (!zend_is_callable_ex(zcallable, NULL, IS_CALLABLE_STRICT, &func_name, &func_name_len, &fcc, &error TSRMLS_CC)) { alfi.ce = fcc.calling_scope; alfi.func_ptr = fcc.function_handler; @@ -518,8 +509,7 @@ PHP_FUNCTION(spl_autoload_register) } efree(func_name); RETURN_FALSE; - } - else if (do_throw) { + } else if (do_throw) { zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Passed array does not specify %s %smethod (%s)", alfi.func_ptr ? "a callable" : "an existing", !obj_ptr ? "static " : "", error); } if (error) { @@ -546,6 +536,16 @@ PHP_FUNCTION(spl_autoload_register) efree(func_name); RETURN_FALSE; } + } else if (fcc.function_handler->type == ZEND_INTERNAL_FUNCTION && + fcc.function_handler->internal_function.handler == zif_spl_autoload_call) { + if (do_throw) { + zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Function spl_autoload_call() cannot be registered"); + } + if (error) { + efree(error); + } + efree(func_name); + RETURN_FALSE; } alfi.closure = NULL; alfi.ce = fcc.calling_scope; @@ -554,23 +554,23 @@ PHP_FUNCTION(spl_autoload_register) if (error) { efree(error); } - - lc_name = safe_emalloc(func_name_len, 1, sizeof(long) + 1); - zend_str_tolower_copy(lc_name, func_name, func_name_len); - efree(func_name); if (Z_TYPE_P(zcallable) == IS_OBJECT) { alfi.closure = zcallable; Z_ADDREF_P(zcallable); - lc_name = erealloc(lc_name, func_name_len + 2 + sizeof(zend_object_handle)); - memcpy(lc_name + func_name_len, &Z_OBJ_HANDLE_P(zcallable), - sizeof(zend_object_handle)); - func_name_len += sizeof(zend_object_handle); - lc_name[func_name_len] = '\0'; + lc_name = STR_ALLOC(func_name_len + 2 + sizeof(zend_uint), 0); + zend_str_tolower_copy(lc_name->val, func_name, func_name_len); + memcpy(lc_name->val + func_name_len, &Z_OBJ_HANDLE_P(zcallable), sizeof(zend_uint)); + lc_name->len += sizeof(zend_uint); + lc_name->val[lc_name->len] = '\0'; + } else { + lc_name = STR_ALLOC(func_name_len, 0); + zend_str_tolower_copy(lc_name->val, func_name, func_name_len); } + efree(func_name); - if (SPL_G(autoload_functions) && zend_hash_exists(SPL_G(autoload_functions), (char*)lc_name, func_name_len+1)) { + if (SPL_G(autoload_functions) && zend_hash_exists(SPL_G(autoload_functions), lc_name)) { if (alfi.closure) { Z_DELREF_P(zcallable); } @@ -579,10 +579,9 @@ PHP_FUNCTION(spl_autoload_register) if (obj_ptr && !(alfi.func_ptr->common.fn_flags & ZEND_ACC_STATIC)) { /* add object id to the hash to ensure uniqueness, for more reference look at bug #40091 */ - lc_name = erealloc(lc_name, func_name_len + 2 + sizeof(zend_object_handle)); - memcpy(lc_name + func_name_len, &Z_OBJ_HANDLE_P(obj_ptr), sizeof(zend_object_handle)); - func_name_len += sizeof(zend_object_handle); - lc_name[func_name_len] = '\0'; + STR_EREALLOC(lc_name, lc_name->len + 2 + sizeof(zend_uint)); + memcpy(lc_name->val + lc_name->len - 2 - sizeof(zend_uint), &Z_OBJ_HANDLE_P(obj_ptr), sizeof(zend_uint)); + lc_name->val[lc_name->len] = '\0'; alfi.obj = obj_ptr; Z_ADDREF_P(alfi.obj); } else { @@ -594,7 +593,7 @@ PHP_FUNCTION(spl_autoload_register) zend_hash_init(SPL_G(autoload_functions), 1, NULL, (dtor_func_t) autoload_func_info_dtor, 0); } - zend_hash_find(EG(function_table), "spl_autoload", sizeof("spl_autoload"), (void **) &spl_func_ptr); + spl_func_ptr = zend_hash_str_find_ptr(EG(function_table), "spl_autoload", sizeof("spl_autoload") - 1); if (EG(autoload_func) == spl_func_ptr) { /* registered already, so we insert that first */ autoload_func_info spl_alfi; @@ -603,14 +602,15 @@ PHP_FUNCTION(spl_autoload_register) spl_alfi.obj = NULL; spl_alfi.ce = NULL; spl_alfi.closure = NULL; - zend_hash_add(SPL_G(autoload_functions), "spl_autoload", sizeof("spl_autoload"), &spl_alfi, sizeof(autoload_func_info), NULL); + zend_hash_str_add_mem(SPL_G(autoload_functions), "spl_autoload", sizeof("spl_autoload") - 1, + (void *)&spl_alfi, sizeof(autoload_func_info)); if (prepend && SPL_G(autoload_functions)->nNumOfElements > 1) { /* Move the newly created element to the head of the hashtable */ HT_MOVE_TAIL_TO_HEAD(SPL_G(autoload_functions)); } } - if (zend_hash_add(SPL_G(autoload_functions), lc_name, func_name_len+1, &alfi.func_ptr, sizeof(autoload_func_info), NULL) == FAILURE) { + if (zend_hash_add_mem(SPL_G(autoload_functions), lc_name, &alfi.func_ptr, sizeof(autoload_func_info)) == NULL) { if (obj_ptr && !(alfi.func_ptr->common.fn_flags & ZEND_ACC_STATIC)) { Z_DELREF_P(alfi.obj); } @@ -623,14 +623,15 @@ PHP_FUNCTION(spl_autoload_register) HT_MOVE_TAIL_TO_HEAD(SPL_G(autoload_functions)); } skip: - efree(lc_name); + STR_FREE(lc_name); } if (SPL_G(autoload_functions)) { - zend_hash_find(EG(function_table), "spl_autoload_call", sizeof("spl_autoload_call"), (void **) &EG(autoload_func)); + EG(autoload_func) = zend_hash_str_find_ptr(EG(function_table), "spl_autoload_call", sizeof("spl_autoload_call") - 1); } else { - zend_hash_find(EG(function_table), "spl_autoload", sizeof("spl_autoload"), (void **) &EG(autoload_func)); + EG(autoload_func) = zend_hash_str_find_ptr(EG(function_table), "spl_autoload", sizeof("spl_autoload") - 1); } + RETURN_TRUE; } /* }}} */ @@ -640,7 +641,7 @@ PHP_FUNCTION(spl_autoload_unregister) { char *func_name, *error = NULL; int func_name_len; - char *lc_name = NULL; + zend_string *lc_name; zval *zcallable; int success = FAILURE; zend_function *spl_func_ptr; @@ -666,20 +667,20 @@ PHP_FUNCTION(spl_autoload_unregister) efree(error); } - lc_name = safe_emalloc(func_name_len, 1, sizeof(long) + 1); - zend_str_tolower_copy(lc_name, func_name, func_name_len); - efree(func_name); - if (Z_TYPE_P(zcallable) == IS_OBJECT) { - lc_name = erealloc(lc_name, func_name_len + 2 + sizeof(zend_object_handle)); - memcpy(lc_name + func_name_len, &Z_OBJ_HANDLE_P(zcallable), - sizeof(zend_object_handle)); - func_name_len += sizeof(zend_object_handle); - lc_name[func_name_len] = '\0'; + lc_name = STR_ALLOC(func_name_len + 2 + sizeof(zend_uint), 0); + zend_str_tolower_copy(lc_name->val, func_name, func_name_len); + memcpy(lc_name->val + func_name_len, &Z_OBJ_HANDLE_P(zcallable), sizeof(zend_uint)); + lc_name->len += sizeof(zend_uint); + lc_name->val[lc_name->len] = '\0'; + } else { + lc_name = STR_ALLOC(func_name_len, 0); + zend_str_tolower_copy(lc_name->val, func_name, func_name_len); } + efree(func_name); if (SPL_G(autoload_functions)) { - if (func_name_len == sizeof("spl_autoload_call")-1 && !strcmp(lc_name, "spl_autoload_call")) { + if (func_name_len == sizeof("spl_autoload_call") - 1 && !strcmp(lc_name->val, "spl_autoload_call")) { /* remove all */ zend_hash_destroy(SPL_G(autoload_functions)); FREE_HASHTABLE(SPL_G(autoload_functions)); @@ -688,18 +689,17 @@ PHP_FUNCTION(spl_autoload_unregister) success = SUCCESS; } else { /* remove specific */ - success = zend_hash_del(SPL_G(autoload_functions), lc_name, func_name_len+1); + success = zend_hash_del(SPL_G(autoload_functions), lc_name); if (success != SUCCESS && obj_ptr) { - lc_name = erealloc(lc_name, func_name_len + 2 + sizeof(zend_object_handle)); - memcpy(lc_name + func_name_len, &Z_OBJ_HANDLE_P(obj_ptr), sizeof(zend_object_handle)); - func_name_len += sizeof(zend_object_handle); - lc_name[func_name_len] = '\0'; - success = zend_hash_del(SPL_G(autoload_functions), lc_name, func_name_len+1); + STR_EREALLOC(lc_name, lc_name->len + 2 + sizeof(zend_uint)); + memcpy(lc_name->val + lc_name->len - 2 - sizeof(zend_uint), &Z_OBJ_HANDLE_P(obj_ptr), sizeof(zend_uint)); + lc_name->val[lc_name->len] = '\0'; + success = zend_hash_del(SPL_G(autoload_functions), lc_name); } } - } else if (func_name_len == sizeof("spl_autoload")-1 && !strcmp(lc_name, "spl_autoload")) { + } else if (func_name_len == sizeof("spl_autoload")-1 && !strcmp(lc_name->val, "spl_autoload")) { /* register single spl_autoload() */ - zend_hash_find(EG(function_table), "spl_autoload", sizeof("spl_autoload"), (void **) &spl_func_ptr); + spl_func_ptr = zend_hash_str_find_ptr(EG(function_table), "spl_autoload", sizeof("spl_autoload")); if (EG(autoload_func) == spl_func_ptr) { success = SUCCESS; @@ -707,7 +707,7 @@ PHP_FUNCTION(spl_autoload_unregister) } } - efree(lc_name); + STR_FREE(lc_name); RETURN_BOOL(success == SUCCESS); } /* }}} */ @@ -724,7 +724,7 @@ PHP_FUNCTION(spl_autoload_functions) } if (!EG(autoload_func)) { - if (zend_hash_find(EG(function_table), ZEND_AUTOLOAD_FUNC_NAME, sizeof(ZEND_AUTOLOAD_FUNC_NAME), (void **) &fptr) == SUCCESS) { + if ((fptr = zend_hash_str_find_ptr(EG(function_table), ZEND_AUTOLOAD_FUNC_NAME, sizeof(ZEND_AUTOLOAD_FUNC_NAME) - 1))) { array_init(return_value); add_next_index_stringl(return_value, ZEND_AUTOLOAD_FUNC_NAME, sizeof(ZEND_AUTOLOAD_FUNC_NAME)-1, 1); return; @@ -732,13 +732,13 @@ PHP_FUNCTION(spl_autoload_functions) RETURN_FALSE; } - zend_hash_find(EG(function_table), "spl_autoload_call", sizeof("spl_autoload_call"), (void **) &fptr); + fptr = zend_hash_str_find_ptr(EG(function_table), "spl_autoload_call", sizeof("spl_autoload_call") - 1); if (EG(autoload_func) == fptr) { array_init(return_value); zend_hash_internal_pointer_reset_ex(SPL_G(autoload_functions), &function_pos); while(zend_hash_has_more_elements_ex(SPL_G(autoload_functions), &function_pos) == SUCCESS) { - zend_hash_get_current_data_ex(SPL_G(autoload_functions), (void **) &alfi, &function_pos); + alfi = zend_hash_get_current_data_ptr_ex(SPL_G(autoload_functions), &function_pos); if (alfi->closure) { Z_ADDREF_P(alfi->closure); add_next_index_zval(return_value, alfi->closure); @@ -751,19 +751,18 @@ PHP_FUNCTION(spl_autoload_functions) Z_ADDREF_P(alfi->obj); add_next_index_zval(tmp, alfi->obj); } else { - add_next_index_string(tmp, alfi->ce->name, 1); + add_next_index_str(tmp, alfi->ce->name); } - add_next_index_string(tmp, alfi->func_ptr->common.function_name, 1); + add_next_index_str(tmp, alfi->func_ptr->common.function_name); add_next_index_zval(return_value, tmp); } else { - if (strncmp(alfi->func_ptr->common.function_name, "__lambda_func", sizeof("__lambda_func") - 1)) { - add_next_index_string(return_value, alfi->func_ptr->common.function_name, 1); + if (strncmp(alfi->func_ptr->common.function_name->val, "__lambda_func", sizeof("__lambda_func") - 1)) { + add_next_index_str(return_value, alfi->func_ptr->common.function_name); } else { - char *key; - uint len; - long dummy; - zend_hash_get_current_key_ex(SPL_G(autoload_functions), &key, &len, &dummy, 0, &function_pos); - add_next_index_stringl(return_value, key, len - 1, 1); + zend_string *key; + ulong dummy; + zend_hash_get_current_key_ex(SPL_G(autoload_functions), &key, &dummy, 0, &function_pos); + add_next_index_str(return_value, key); } } @@ -773,7 +772,7 @@ PHP_FUNCTION(spl_autoload_functions) } array_init(return_value); - add_next_index_string(return_value, EG(autoload_func)->common.function_name, 1); + add_next_index_str(return_value, EG(autoload_func)->common.function_name); } /* }}} */ /* {{{ proto string spl_object_hash(object obj) @@ -781,16 +780,15 @@ PHP_FUNCTION(spl_autoload_functions) PHP_FUNCTION(spl_object_hash) { zval *obj; - char* hash; + char hash[33]; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &obj) == FAILURE) { return; } - hash = emalloc(33); php_spl_object_hash(obj, hash TSRMLS_CC); - RETVAL_STRING(hash, 0); + RETURN_STRING(hash); } /* }}} */ @@ -968,7 +966,6 @@ PHP_MINIT_FUNCTION(spl) PHP_RINIT_FUNCTION(spl) /* {{{ */ { SPL_G(autoload_extensions) = NULL; - SPL_G(autoload_extensions_len) = 0; SPL_G(autoload_functions) = NULL; SPL_G(hash_mask_init) = 0; return SUCCESS; @@ -977,9 +974,8 @@ PHP_RINIT_FUNCTION(spl) /* {{{ */ PHP_RSHUTDOWN_FUNCTION(spl) /* {{{ */ { if (SPL_G(autoload_extensions)) { - efree(SPL_G(autoload_extensions)); + STR_RELEASE(SPL_G(autoload_extensions)); SPL_G(autoload_extensions) = NULL; - SPL_G(autoload_extensions_len) = 0; } if (SPL_G(autoload_functions)) { zend_hash_destroy(SPL_G(autoload_functions)); diff --git a/ext/spl/php_spl.h b/ext/spl/php_spl.h index 425e56cb1a..b186255f57 100644 --- a/ext/spl/php_spl.h +++ b/ext/spl/php_spl.h @@ -58,10 +58,9 @@ PHP_MINFO_FUNCTION(spl); ZEND_BEGIN_MODULE_GLOBALS(spl) - char * autoload_extensions; - HashTable * autoload_functions; + zend_string *autoload_extensions; + HashTable *autoload_functions; int autoload_running; - int autoload_extensions_len; intptr_t hash_mask_handle; intptr_t hash_mask_handlers; int hash_mask_init; diff --git a/ext/spl/spl_engine.c b/ext/spl/spl_engine.c index c07ce6846f..1787f28e1e 100644 --- a/ext/spl/spl_engine.c +++ b/ext/spl/spl_engine.c @@ -32,14 +32,11 @@ #include "spl_array.h" /* {{{ spl_instantiate */ -PHPAPI void spl_instantiate(zend_class_entry *pce, zval **object, int alloc TSRMLS_DC) +PHPAPI void spl_instantiate(zend_class_entry *pce, zval *object TSRMLS_DC) { - if (alloc) { - ALLOC_ZVAL(*object); - } - object_init_ex(*object, pce); - Z_SET_REFCOUNT_PP(object, 1); - Z_SET_ISREF_PP(object); /* check if this can be hold always */ + object_init_ex(object, pce); + Z_SET_REFCOUNT_P(object, 1); + Z_SET_ISREF_P(object); /* check if this can be hold always */ } /* }}} */ diff --git a/ext/spl/spl_engine.h b/ext/spl/spl_engine.h index a67e60c105..8c72ca9691 100644 --- a/ext/spl/spl_engine.h +++ b/ext/spl/spl_engine.h @@ -25,26 +25,28 @@ #include "php_spl.h" #include "zend_interfaces.h" -PHPAPI void spl_instantiate(zend_class_entry *pce, zval **object, int alloc TSRMLS_DC); +PHPAPI void spl_instantiate(zend_class_entry *pce, zval *object TSRMLS_DC); PHPAPI long spl_offset_convert_to_long(zval *offset TSRMLS_DC); /* {{{ spl_instantiate_arg_ex1 */ -static inline int spl_instantiate_arg_ex1(zend_class_entry *pce, zval **retval, int alloc, zval *arg1 TSRMLS_DC) +static inline int spl_instantiate_arg_ex1(zend_class_entry *pce, zval *retval, zval *arg1 TSRMLS_DC) { - spl_instantiate(pce, retval, alloc TSRMLS_CC); + zend_function *func = pce->constructor; + spl_instantiate(pce, retval TSRMLS_CC); - zend_call_method(retval, pce, &pce->constructor, pce->constructor->common.function_name, strlen(pce->constructor->common.function_name), NULL, 1, arg1, NULL TSRMLS_CC); + zend_call_method(retval, pce, &func, func->common.function_name->val, func->common.function_name->len, NULL, 1, arg1, NULL TSRMLS_CC); return 0; } /* }}} */ /* {{{ spl_instantiate_arg_ex2 */ -static inline int spl_instantiate_arg_ex2(zend_class_entry *pce, zval **retval, int alloc, zval *arg1, zval *arg2 TSRMLS_DC) +static inline int spl_instantiate_arg_ex2(zend_class_entry *pce, zval *retval, zval *arg1, zval *arg2 TSRMLS_DC) { - spl_instantiate(pce, retval, alloc TSRMLS_CC); + zend_function *func = pce->constructor; + spl_instantiate(pce, retval TSRMLS_CC); - zend_call_method(retval, pce, &pce->constructor, pce->constructor->common.function_name, strlen(pce->constructor->common.function_name), NULL, 2, arg1, arg2 TSRMLS_CC); + zend_call_method(retval, pce, &func, func->common.function_name->val, func->common.function_name->len, NULL, 2, arg1, arg2 TSRMLS_CC); return 0; } /* }}} */ diff --git a/ext/spl/spl_functions.c b/ext/spl/spl_functions.c index 1a3134f85f..6b5a612637 100644 --- a/ext/spl/spl_functions.c +++ b/ext/spl/spl_functions.c @@ -80,13 +80,13 @@ void spl_register_property( zend_class_entry * class_entry, char *prop_name, int void spl_add_class_name(zval *list, zend_class_entry * pce, int allow, int ce_flags TSRMLS_DC) { if (!allow || (allow > 0 && pce->ce_flags & ce_flags) || (allow < 0 && !(pce->ce_flags & ce_flags))) { - size_t len = pce->name_length; zval *tmp; - if (zend_hash_find(Z_ARRVAL_P(list), pce->name, len+1, (void*)&tmp) == FAILURE) { + if ((tmp = zend_hash_find(Z_ARRVAL_P(list), pce->name)) == NULL) { MAKE_STD_ZVAL(tmp); - ZVAL_STRINGL(tmp, pce->name, pce->name_length, 1); - zend_hash_add(Z_ARRVAL_P(list), pce->name, len+1, &tmp, sizeof(zval *), NULL); + STR_ADDREF(pce->name); + ZVAL_STR(tmp, pce->name); + zend_hash_add(Z_ARRVAL_P(list), pce->name, tmp); } } } @@ -137,7 +137,7 @@ char * spl_gen_private_prop_name(zend_class_entry *ce, char *prop_name, int prop { char *rv; - zend_mangle_property_name(&rv, name_len, ce->name, ce->name_length, prop_name, prop_len, 0); + zend_mangle_property_name(&rv, name_len, ce->name->val, ce->name->len, prop_name, prop_len, 0); return rv; } diff --git a/ext/spl/spl_functions.h b/ext/spl/spl_functions.h index 214780f869..a15da36357 100644 --- a/ext/spl/spl_functions.h +++ b/ext/spl/spl_functions.h @@ -23,7 +23,7 @@ #include "php.h" -typedef zend_object_value (*create_object_func_t)(zend_class_entry *class_type TSRMLS_DC); +typedef zend_object* (*create_object_func_t)(zend_class_entry *class_type TSRMLS_DC); #define REGISTER_SPL_STD_CLASS(class_name, obj_ctor) \ spl_register_std_class(&spl_ce_ ## class_name, # class_name, obj_ctor, NULL TSRMLS_CC); diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 867f5e4e7d..cc94cfee09 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -473,7 +473,8 @@ static void spl_recursive_it_it_construct(INTERNAL_FUNCTION_PARAMETERS, zend_cla } else { ZVAL_LONG(caching_it_flags, CIT_CATCH_GET_CHILD); } - spl_instantiate_arg_ex2(spl_ce_RecursiveCachingIterator, &caching_it, 1, iterator, caching_it_flags TSRMLS_CC); + ALLOC_ZVAL(caching_it); + spl_instantiate_arg_ex2(spl_ce_RecursiveCachingIterator, caching_it, iterator, caching_it_flags TSRMLS_CC); zval_ptr_dtor(&caching_it_flags); if (inc_refcount == 0 && iterator) { zval_ptr_dtor(&iterator); @@ -1879,7 +1880,7 @@ SPL_METHOD(RecursiveFilterIterator, getChildren) zend_call_method_with_0_params(&intern->inner.zobject, intern->inner.ce, NULL, "getchildren", &retval); if (!EG(exception) && retval) { - spl_instantiate_arg_ex1(Z_OBJCE_P(getThis()), &return_value, 0, retval TSRMLS_CC); + spl_instantiate_arg_ex1(Z_OBJCE_P(getThis()), return_value, retval TSRMLS_CC); } if (retval) { zval_ptr_dtor(&retval); @@ -1901,7 +1902,7 @@ SPL_METHOD(RecursiveCallbackFilterIterator, getChildren) zend_call_method_with_0_params(&intern->inner.zobject, intern->inner.ce, NULL, "getchildren", &retval); if (!EG(exception) && retval) { - spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), &return_value, 0, retval, intern->u.cbfilter->fci.function_name TSRMLS_CC); + spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), return_value, retval, intern->u.cbfilter->fci.function_name TSRMLS_CC); } if (retval) { zval_ptr_dtor(&retval); @@ -2203,7 +2204,7 @@ SPL_METHOD(RecursiveRegexIterator, getChildren) if (!EG(exception)) { MAKE_STD_ZVAL(regex); ZVAL_STRING(regex, intern->u.regex.regex, 1); - spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), &return_value, 0, retval, regex TSRMLS_CC); + spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), return_value, retval, regex TSRMLS_CC); zval_ptr_dtor(®ex); } if (retval) { @@ -2613,7 +2614,8 @@ static inline void spl_caching_it_next(spl_dual_it_object *intern TSRMLS_DC) } else { INIT_PZVAL(&zflags); ZVAL_LONG(&zflags, intern->u.caching.flags & CIT_PUBLIC); - spl_instantiate_arg_ex2(spl_ce_RecursiveCachingIterator, &intern->u.caching.zchildren, 1, zchildren, &zflags TSRMLS_CC); + ALLOC_ZVAL(intern->u.caching.zchildren); + spl_instantiate_arg_ex2(spl_ce_RecursiveCachingIterator, intern->u.caching.zchildren, zchildren, &zflags TSRMLS_CC); zval_ptr_dtor(&zchildren); } } |