diff options
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 2630 |
1 files changed, 1376 insertions, 1254 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 5fa7fb908e..fe17968f06 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | Zend Engine | +----------------------------------------------------------------------+ - | Copyright (c) 1998-2013 Zend Technologies Ltd. (http://www.zend.com) | + | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ | This source file is subject to version 2.00 of the Zend license, | | that is bundled with this package in the file LICENSE, and is | @@ -27,6 +27,7 @@ #include "zend_constants.h" #include "zend_exceptions.h" #include "zend_closures.h" +#include "zend_inheritance.h" #ifdef HAVE_STDARG_H #include <stdarg.h> @@ -44,14 +45,13 @@ static zend_class_entry **class_cleanup_handlers; /* this function doesn't check for too many parameters */ ZEND_API int zend_get_parameters(int ht, int param_count, ...) /* {{{ */ { - void **p; int arg_count; va_list ptr; zval **param, *param_ptr; TSRMLS_FETCH(); - p = zend_vm_stack_top(TSRMLS_C) - 1; - arg_count = (int)(zend_uintptr_t) *p; + param_ptr = ZEND_CALL_ARG(EG(current_execute_data), 1); + arg_count = EG(current_execute_data)->num_args; if (param_count>arg_count) { return FAILURE; @@ -61,20 +61,15 @@ ZEND_API int zend_get_parameters(int ht, int param_count, ...) /* {{{ */ while (param_count-->0) { param = va_arg(ptr, zval **); - param_ptr = *(p-arg_count); - if (!PZVAL_IS_REF(param_ptr) && Z_REFCOUNT_P(param_ptr) > 1) { - zval *new_tmp; - - ALLOC_ZVAL(new_tmp); - *new_tmp = *param_ptr; - zval_copy_ctor(new_tmp); - INIT_PZVAL(new_tmp); - param_ptr = new_tmp; - Z_DELREF_P((zval *) *(p-arg_count)); - *(p-arg_count) = param_ptr; + if (!Z_ISREF_P(param_ptr) && Z_REFCOUNT_P(param_ptr) > 1) { + zval new_tmp; + + ZVAL_DUP(&new_tmp, param_ptr); + Z_DELREF_P(param_ptr); + ZVAL_COPY_VALUE(param_ptr, &new_tmp); } *param = param_ptr; - arg_count--; + param_ptr++; } va_end(ptr); @@ -82,52 +77,17 @@ ZEND_API int zend_get_parameters(int ht, int param_count, ...) /* {{{ */ } /* }}} */ -ZEND_API int _zend_get_parameters_array(int ht, int param_count, zval **argument_array TSRMLS_DC) /* {{{ */ -{ - void **p; - int arg_count; - zval *param_ptr; - - p = zend_vm_stack_top(TSRMLS_C) - 1; - arg_count = (int)(zend_uintptr_t) *p; - - if (param_count>arg_count) { - return FAILURE; - } - - while (param_count-->0) { - param_ptr = *(p-arg_count); - if (!PZVAL_IS_REF(param_ptr) && Z_REFCOUNT_P(param_ptr) > 1) { - zval *new_tmp; - - ALLOC_ZVAL(new_tmp); - *new_tmp = *param_ptr; - zval_copy_ctor(new_tmp); - INIT_PZVAL(new_tmp); - param_ptr = new_tmp; - Z_DELREF_P((zval *) *(p-arg_count)); - *(p-arg_count) = param_ptr; - } - *(argument_array++) = param_ptr; - arg_count--; - } - - return SUCCESS; -} -/* }}} */ - /* Zend-optimized Extended functions */ /* this function doesn't check for too many parameters */ ZEND_API int zend_get_parameters_ex(int param_count, ...) /* {{{ */ { - void **p; int arg_count; va_list ptr; - zval ***param; + zval **param, *param_ptr; TSRMLS_FETCH(); - p = zend_vm_stack_top(TSRMLS_C) - 1; - arg_count = (int)(zend_uintptr_t) *p; + param_ptr = ZEND_CALL_ARG(EG(current_execute_data), 1); + arg_count = EG(current_execute_data)->num_args; if (param_count>arg_count) { return FAILURE; @@ -135,8 +95,9 @@ ZEND_API int zend_get_parameters_ex(int param_count, ...) /* {{{ */ va_start(ptr, param_count); while (param_count-->0) { - param = va_arg(ptr, zval ***); - *param = (zval **) p-(arg_count--); + param = va_arg(ptr, zval **); + *param = param_ptr; + param_ptr++; } va_end(ptr); @@ -144,23 +105,22 @@ ZEND_API int zend_get_parameters_ex(int param_count, ...) /* {{{ */ } /* }}} */ -ZEND_API int _zend_get_parameters_array_ex(int param_count, zval ***argument_array TSRMLS_DC) /* {{{ */ +ZEND_API int _zend_get_parameters_array_ex(int param_count, zval *argument_array TSRMLS_DC) /* {{{ */ { - void **p; + zval *param_ptr; int arg_count; - p = zend_vm_stack_top(TSRMLS_C) - 1; - arg_count = (int)(zend_uintptr_t) *p; + param_ptr = ZEND_CALL_ARG(EG(current_execute_data), 1); + arg_count = EG(current_execute_data)->num_args; if (param_count>arg_count) { return FAILURE; } while (param_count-->0) { - zval **value = (zval**)(p-arg_count); - - *(argument_array++) = value; - arg_count--; + ZVAL_COPY_VALUE(argument_array, param_ptr); + argument_array++; + param_ptr++; } return SUCCESS; @@ -169,20 +129,22 @@ ZEND_API int _zend_get_parameters_array_ex(int param_count, zval ***argument_arr ZEND_API int zend_copy_parameters_array(int param_count, zval *argument_array TSRMLS_DC) /* {{{ */ { - void **p; + zval *param_ptr; int arg_count; - p = zend_vm_stack_top(TSRMLS_C) - 1; - arg_count = (int)(zend_uintptr_t) *p; + param_ptr = ZEND_CALL_ARG(EG(current_execute_data), 1); + arg_count = EG(current_execute_data)->num_args; if (param_count>arg_count) { return FAILURE; } while (param_count-->0) { - zval **param = (zval **) p-(arg_count--); - zval_add_ref(param); - add_next_index_zval(argument_array, *param); + if (Z_REFCOUNTED_P(param_ptr)) { + Z_ADDREF_P(param_ptr); + } + zend_hash_next_index_insert_new(Z_ARRVAL_P(argument_array), param_ptr); + param_ptr++; } return SUCCESS; @@ -202,7 +164,8 @@ ZEND_API void zend_wrong_param_count(TSRMLS_D) /* {{{ */ ZEND_API char *zend_get_type_by_const(int type) /* {{{ */ { switch(type) { - case IS_BOOL: + case IS_FALSE: + case IS_TRUE: return "boolean"; case IS_LONG: return "integer"; @@ -228,90 +191,191 @@ ZEND_API char *zend_get_type_by_const(int type) /* {{{ */ ZEND_API char *zend_zval_type_name(const zval *arg) /* {{{ */ { + ZVAL_DEREF(arg); return zend_get_type_by_const(Z_TYPE_P(arg)); } /* }}} */ -ZEND_API zend_class_entry *zend_get_class_entry(const zval *zobject TSRMLS_DC) /* {{{ */ +static int parse_arg_object_to_string(zval *arg, char **p, size_t *pl, int type TSRMLS_DC) /* {{{ */ { - if (Z_OBJ_HT_P(zobject)->get_class_entry) { - return Z_OBJ_HT_P(zobject)->get_class_entry(zobject TSRMLS_CC); - } else { - zend_error(E_ERROR, "Class entry requested for an object without PHP class"); - return NULL; + if (Z_OBJ_HANDLER_P(arg, cast_object)) { + zval obj; + if (Z_OBJ_HANDLER_P(arg, cast_object)(arg, &obj, type TSRMLS_CC) == SUCCESS) { + zval_ptr_dtor(arg); + ZVAL_COPY_VALUE(arg, &obj); + *pl = Z_STRLEN_P(arg); + *p = Z_STRVAL_P(arg); + return SUCCESS; + } } -} -/* }}} */ - -/* returns 1 if you need to copy result, 0 if it's already a copy */ -ZEND_API int zend_get_object_classname(const zval *object, const char **class_name, zend_uint *class_name_len TSRMLS_DC) /* {{{ */ -{ - if (Z_OBJ_HT_P(object)->get_class_name == NULL || - Z_OBJ_HT_P(object)->get_class_name(object, class_name, class_name_len, 0 TSRMLS_CC) != SUCCESS) { - zend_class_entry *ce = Z_OBJCE_P(object); - - *class_name = ce->name; - *class_name_len = ce->name_length; - return 1; + /* Standard PHP objects */ + if (Z_OBJ_HT_P(arg) == &std_object_handlers || !Z_OBJ_HANDLER_P(arg, cast_object)) { + SEPARATE_ZVAL_NOREF(arg); + if (zend_std_cast_object_tostring(arg, arg, type TSRMLS_CC) == SUCCESS) { + *pl = Z_STRLEN_P(arg); + *p = Z_STRVAL_P(arg); + return SUCCESS; + } } - return 0; + if (!Z_OBJ_HANDLER_P(arg, cast_object) && Z_OBJ_HANDLER_P(arg, get)) { + zval rv; + zval *z = Z_OBJ_HANDLER_P(arg, get)(arg, &rv TSRMLS_CC); + Z_ADDREF_P(z); + if(Z_TYPE_P(z) != IS_OBJECT) { + zval_dtor(arg); + ZVAL_NULL(arg); + if (!zend_make_printable_zval(z, arg TSRMLS_CC)) { + ZVAL_ZVAL(arg, z, 1, 1); + } + *pl = Z_STRLEN_P(arg); + *p = Z_STRVAL_P(arg); + return SUCCESS; + } + zval_ptr_dtor(z); + } + return FAILURE; } /* }}} */ -static int parse_arg_object_to_string(zval **arg, char **p, int *pl, int type TSRMLS_DC) /* {{{ */ +ZEND_API int parse_arg_object_to_str(zval *arg, zend_string **str, int type TSRMLS_DC) /* {{{ */ { - if (Z_OBJ_HANDLER_PP(arg, cast_object)) { - zval *obj; - MAKE_STD_ZVAL(obj); - if (Z_OBJ_HANDLER_P(*arg, cast_object)(*arg, obj, type TSRMLS_CC) == SUCCESS) { + if (Z_OBJ_HANDLER_P(arg, cast_object)) { + zval obj; + if (Z_OBJ_HANDLER_P(arg, cast_object)(arg, &obj, type TSRMLS_CC) == SUCCESS) { zval_ptr_dtor(arg); - *arg = obj; - *pl = Z_STRLEN_PP(arg); - *p = Z_STRVAL_PP(arg); + ZVAL_COPY_VALUE(arg, &obj); + *str = Z_STR_P(arg); return SUCCESS; } - efree(obj); } /* Standard PHP objects */ - if (Z_OBJ_HT_PP(arg) == &std_object_handlers || !Z_OBJ_HANDLER_PP(arg, cast_object)) { - SEPARATE_ZVAL_IF_NOT_REF(arg); - if (zend_std_cast_object_tostring(*arg, *arg, type TSRMLS_CC) == SUCCESS) { - *pl = Z_STRLEN_PP(arg); - *p = Z_STRVAL_PP(arg); + if (Z_OBJ_HT_P(arg) == &std_object_handlers || !Z_OBJ_HANDLER_P(arg, cast_object)) { + SEPARATE_ZVAL_NOREF(arg); + if (zend_std_cast_object_tostring(arg, arg, type TSRMLS_CC) == SUCCESS) { + *str = Z_STR_P(arg); return SUCCESS; } } - if (!Z_OBJ_HANDLER_PP(arg, cast_object) && Z_OBJ_HANDLER_PP(arg, get)) { - int use_copy; - zval *z = Z_OBJ_HANDLER_PP(arg, get)(*arg TSRMLS_CC); + if (!Z_OBJ_HANDLER_P(arg, cast_object) && Z_OBJ_HANDLER_P(arg, get)) { + zval rv; + zval *z = Z_OBJ_HANDLER_P(arg, get)(arg, &rv TSRMLS_CC); Z_ADDREF_P(z); if(Z_TYPE_P(z) != IS_OBJECT) { - zval_dtor(*arg); - Z_TYPE_P(*arg) = IS_NULL; - zend_make_printable_zval(z, *arg, &use_copy); - if (!use_copy) { - ZVAL_ZVAL(*arg, z, 1, 1); - } - *pl = Z_STRLEN_PP(arg); - *p = Z_STRVAL_PP(arg); + zval_dtor(arg); + ZVAL_NULL(arg); + if (!zend_make_printable_zval(z, arg TSRMLS_CC)) { + ZVAL_ZVAL(arg, z, 1, 1); + } + *str = Z_STR_P(arg); return SUCCESS; } - zval_ptr_dtor(&z); + zval_ptr_dtor(z); } return FAILURE; } /* }}} */ -static const char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, const char **spec, char **error, int *severity TSRMLS_DC) /* {{{ */ +#ifdef FAST_ZPP +ZEND_API void zend_wrong_paramers_count_error(int num_args, int min_num_args, int max_num_args TSRMLS_DC) /* {{{ */ +{ + zend_function *active_function = EG(current_execute_data)->func; + const char *class_name = active_function->common.scope ? active_function->common.scope->name->val : ""; + + zend_error(E_WARNING, "%s%s%s() expects %s %d parameter%s, %d given", + class_name, \ + class_name[0] ? "::" : "", \ + active_function->common.function_name->val, + min_num_args == max_num_args ? "exactly" : num_args < min_num_args ? "at least" : "at most", + num_args < min_num_args ? min_num_args : max_num_args, + (num_args < min_num_args ? min_num_args : max_num_args) == 1 ? "" : "s", + num_args); +} +/* }}} */ + +ZEND_API void zend_wrong_paramer_type_error(int num, zend_expected_type expected_type, zval *arg TSRMLS_DC) /* {{{ */ +{ + const char *space; + const char *class_name = get_active_class_name(&space TSRMLS_CC); + static const char * const expected_error[] = { + Z_EXPECTED_TYPES(Z_EXPECTED_TYPE_STR) + NULL + }; + + zend_error(E_WARNING, "%s%s%s() expects parameter %d to be %s, %s given", + class_name, space, get_active_function_name(TSRMLS_C), num, expected_error[expected_type], zend_zval_type_name(arg)); +} +/* }}} */ + +ZEND_API void zend_wrong_paramer_class_error(int num, char *name, zval *arg TSRMLS_DC) /* {{{ */ +{ + const char *space; + const char *class_name = get_active_class_name(&space TSRMLS_CC); + + zend_error(E_WARNING, "%s%s%s() expects parameter %d to be %s, %s given", + class_name, space, get_active_function_name(TSRMLS_C), num, name, zend_zval_type_name(arg)); +} +/* }}} */ + +ZEND_API void zend_wrong_callback_error(int severity, int num, char *error TSRMLS_DC) /* {{{ */ +{ + const char *space; + const char *class_name = get_active_class_name(&space TSRMLS_CC); + + zend_error(severity, "%s%s%s() expects parameter %d to be a valid callback, %s", + class_name, space, get_active_function_name(TSRMLS_C), num, error); + efree(error); +} +/* }}} */ + +ZEND_API int _z_param_class(zval *arg, zend_class_entry **pce, int num, int check_null TSRMLS_DC) /* {{{ */ +{ + zend_class_entry *ce_base = *pce; + + if (check_null && Z_TYPE_P(arg) == IS_NULL) { + *pce = NULL; + return 1; + } + convert_to_string_ex(arg); + *pce = zend_lookup_class(Z_STR_P(arg) TSRMLS_CC); + if (ce_base) { + if ((!*pce || !instanceof_function(*pce, ce_base TSRMLS_CC))) { + const char *space; + const char *class_name = get_active_class_name(&space TSRMLS_CC); + + zend_error(E_WARNING, "%s%s%s() expects parameter %d to be a class name derived from %s, '%s' given", + class_name, space, get_active_function_name(TSRMLS_C), num, + ce_base->name->val, Z_STRVAL_P(arg)); + *pce = NULL; + return 0; + } + } + if (!*pce) { + const char *space; + const char *class_name = get_active_class_name(&space TSRMLS_CC); + + zend_error(E_WARNING, "%s%s%s() expects parameter %d to be a valid class name, '%s' given", + class_name, space, get_active_function_name(TSRMLS_C), num, + Z_STRVAL_P(arg)); + return 0; + } + return 1; +} +/* }}} */ +#endif + +static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, const char **spec, char **error, int *severity TSRMLS_DC) /* {{{ */ { const char *spec_walk = *spec; char c = *spec_walk++; int check_null = 0; + zval *real_arg = arg; /* scan through modifiers */ + ZVAL_DEREF(arg); while (1) { if (*spec_walk == '/') { - SEPARATE_ZVAL_IF_NOT_REF(arg); + SEPARATE_ZVAL(arg); + real_arg = arg; } else if (*spec_walk == '!') { check_null = 1; } else { @@ -324,28 +388,28 @@ static const char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, con case 'l': case 'L': { - long *p = va_arg(*va, long *); + zend_long *p = va_arg(*va, zend_long *); if (check_null) { zend_bool *p = va_arg(*va, zend_bool *); - *p = (Z_TYPE_PP(arg) == IS_NULL); + *p = (Z_TYPE_P(arg) == IS_NULL); } - switch (Z_TYPE_PP(arg)) { + switch (Z_TYPE_P(arg)) { case IS_STRING: { double d; int type; - if ((type = is_numeric_string(Z_STRVAL_PP(arg), Z_STRLEN_PP(arg), p, &d, -1)) == 0) { + if ((type = is_numeric_string(Z_STRVAL_P(arg), Z_STRLEN_P(arg), p, &d, -1)) == 0) { return "long"; } else if (type == IS_DOUBLE) { if (c == 'L') { - if (d > LONG_MAX) { - *p = LONG_MAX; + if (d > ZEND_LONG_MAX) { + *p = ZEND_LONG_MAX; break; - } else if (d < LONG_MIN) { - *p = LONG_MIN; + } else if (d < ZEND_LONG_MIN) { + *p = ZEND_LONG_MIN; break; } } @@ -357,19 +421,20 @@ static const char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, con case IS_DOUBLE: if (c == 'L') { - if (Z_DVAL_PP(arg) > LONG_MAX) { - *p = LONG_MAX; + if (Z_DVAL_P(arg) > ZEND_LONG_MAX) { + *p = ZEND_LONG_MAX; break; - } else if (Z_DVAL_PP(arg) < LONG_MIN) { - *p = LONG_MIN; + } else if (Z_DVAL_P(arg) < ZEND_LONG_MIN) { + *p = ZEND_LONG_MIN; break; } } case IS_NULL: + case IS_FALSE: + case IS_TRUE: case IS_LONG: - case IS_BOOL: convert_to_long_ex(arg); - *p = Z_LVAL_PP(arg); + *p = Z_LVAL_P(arg); break; case IS_ARRAY: @@ -387,16 +452,16 @@ static const char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, con if (check_null) { zend_bool *p = va_arg(*va, zend_bool *); - *p = (Z_TYPE_PP(arg) == IS_NULL); + *p = (Z_TYPE_P(arg) == IS_NULL); } - switch (Z_TYPE_PP(arg)) { + switch (Z_TYPE_P(arg)) { case IS_STRING: { - long l; + zend_long l; int type; - if ((type = is_numeric_string(Z_STRVAL_PP(arg), Z_STRLEN_PP(arg), &l, p, -1)) == 0) { + if ((type = is_numeric_string(Z_STRVAL_P(arg), Z_STRLEN_P(arg), &l, p, -1)) == 0) { return "double"; } else if (type == IS_LONG) { *p = (double) l; @@ -405,11 +470,12 @@ static const char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, con break; case IS_NULL: + case IS_FALSE: + case IS_TRUE: case IS_LONG: case IS_DOUBLE: - case IS_BOOL: convert_to_double_ex(arg); - *p = Z_DVAL_PP(arg); + *p = Z_DVAL_P(arg); break; case IS_ARRAY: @@ -425,8 +491,8 @@ static const char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, con case 's': { char **p = va_arg(*va, char **); - int *pl = va_arg(*va, int *); - switch (Z_TYPE_PP(arg)) { + size_t *pl = va_arg(*va, size_t *); + switch (Z_TYPE_P(arg)) { case IS_NULL: if (check_null) { *p = NULL; @@ -435,27 +501,22 @@ static const char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, con } /* break omitted intentionally */ - case IS_STRING: case IS_LONG: case IS_DOUBLE: - case IS_BOOL: + case IS_FALSE: + case IS_TRUE: convert_to_string_ex(arg); - if (UNEXPECTED(Z_ISREF_PP(arg) != 0)) { - /* it's dangerous to return pointers to string - buffer of referenced variable, because it can - be clobbered throug magic callbacks */ - SEPARATE_ZVAL(arg); - } - *p = Z_STRVAL_PP(arg); - *pl = Z_STRLEN_PP(arg); - if (c == 'p' && CHECK_ZVAL_NULL_PATH(*arg)) { + case IS_STRING: + *p = Z_STRVAL_P(arg); + *pl = Z_STRLEN_P(arg); + if (c == 'p' && CHECK_ZVAL_NULL_PATH(arg)) { return "a valid path"; } break; case IS_OBJECT: if (parse_arg_object_to_string(arg, p, pl, IS_STRING TSRMLS_CC) == SUCCESS) { - if (c == 'p' && CHECK_ZVAL_NULL_PATH(*arg)) { + if (c == 'p' && CHECK_ZVAL_NULL_PATH(arg)) { return "a valid path"; } break; @@ -469,23 +530,64 @@ static const char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, con } break; + case 'P': + case 'S': + { + zend_string **str = va_arg(*va, zend_string **); + switch (Z_TYPE_P(arg)) { + case IS_NULL: + if (check_null) { + *str = NULL; + break; + } + /* break omitted intentionally */ + + case IS_LONG: + case IS_DOUBLE: + case IS_FALSE: + case IS_TRUE: + convert_to_string_ex(arg); + case IS_STRING: + *str = Z_STR_P(arg); + if (c == 'P' && CHECK_ZVAL_NULL_PATH(arg)) { + return "a valid path"; + } + break; + + case IS_OBJECT: { + if (parse_arg_object_to_str(arg, str, IS_STRING TSRMLS_CC) == SUCCESS) { + if (c == 'P' && CHECK_ZVAL_NULL_PATH(arg)) { + return "a valid path"; + } + break; + } + } + case IS_ARRAY: + case IS_RESOURCE: + default: + return c == 'S' ? "string" : "a valid path"; + } + } + break; + case 'b': { zend_bool *p = va_arg(*va, zend_bool *); if (check_null) { zend_bool *p = va_arg(*va, zend_bool *); - *p = (Z_TYPE_PP(arg) == IS_NULL); + *p = (Z_TYPE_P(arg) == IS_NULL); } - switch (Z_TYPE_PP(arg)) { + switch (Z_TYPE_P(arg)) { case IS_NULL: case IS_STRING: case IS_LONG: case IS_DOUBLE: - case IS_BOOL: + case IS_FALSE: + case IS_TRUE: convert_to_boolean_ex(arg); - *p = Z_BVAL_PP(arg); + *p = Z_TYPE_P(arg) == IS_TRUE; break; case IS_ARRAY: @@ -500,12 +602,12 @@ static const char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, con case 'r': { zval **p = va_arg(*va, zval **); - if (check_null && Z_TYPE_PP(arg) == IS_NULL) { + if (check_null && Z_TYPE_P(arg) == IS_NULL) { *p = NULL; break; } - if (Z_TYPE_PP(arg) == IS_RESOURCE) { - *p = *arg; + if (Z_TYPE_P(arg) == IS_RESOURCE) { + *p = arg; } else { return "resource"; } @@ -515,12 +617,12 @@ static const char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, con case 'a': { zval **p = va_arg(*va, zval **); - if (check_null && Z_TYPE_PP(arg) == IS_NULL) { + if (check_null && Z_TYPE_P(arg) == IS_NULL) { *p = NULL; break; } - if (Z_TYPE_PP(arg) == IS_ARRAY || (c == 'A' && Z_TYPE_PP(arg) == IS_OBJECT)) { - *p = *arg; + if (Z_TYPE_P(arg) == IS_ARRAY || (c == 'A' && Z_TYPE_P(arg) == IS_OBJECT)) { + *p = arg; } else { return "array"; } @@ -530,14 +632,14 @@ static const char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, con case 'h': { HashTable **p = va_arg(*va, HashTable **); - if (check_null && Z_TYPE_PP(arg) == IS_NULL) { + if (check_null && Z_TYPE_P(arg) == IS_NULL) { *p = NULL; break; } - if (Z_TYPE_PP(arg) == IS_ARRAY) { - *p = Z_ARRVAL_PP(arg); - } else if(c == 'H' && Z_TYPE_PP(arg) == IS_OBJECT) { - *p = HASH_OF(*arg); + if (Z_TYPE_P(arg) == IS_ARRAY) { + *p = Z_ARRVAL_P(arg); + } else if(c == 'H' && Z_TYPE_P(arg) == IS_OBJECT) { + *p = HASH_OF(arg); if(*p == NULL) { return "array"; } @@ -550,12 +652,12 @@ static const char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, con case 'o': { zval **p = va_arg(*va, zval **); - if (check_null && Z_TYPE_PP(arg) == IS_NULL) { + if (check_null && Z_TYPE_P(arg) == IS_NULL) { *p = NULL; break; } - if (Z_TYPE_PP(arg) == IS_OBJECT) { - *p = *arg; + if (Z_TYPE_P(arg) == IS_OBJECT) { + *p = arg; } else { return "object"; } @@ -567,16 +669,16 @@ static const char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, con zval **p = va_arg(*va, zval **); zend_class_entry *ce = va_arg(*va, zend_class_entry *); - if (check_null && Z_TYPE_PP(arg) == IS_NULL) { + if (check_null && Z_TYPE_P(arg) == IS_NULL) { *p = NULL; break; } - if (Z_TYPE_PP(arg) == IS_OBJECT && - (!ce || instanceof_function(Z_OBJCE_PP(arg), ce TSRMLS_CC))) { - *p = *arg; + if (Z_TYPE_P(arg) == IS_OBJECT && + (!ce || instanceof_function(Z_OBJCE_P(arg), ce TSRMLS_CC))) { + *p = arg; } else { if (ce) { - return ce->name; + return ce->name->val; } else { return "object"; } @@ -586,30 +688,30 @@ static const char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, con case 'C': { - zend_class_entry **lookup, **pce = va_arg(*va, zend_class_entry **); + zend_class_entry *lookup, **pce = va_arg(*va, zend_class_entry **); zend_class_entry *ce_base = *pce; - if (check_null && Z_TYPE_PP(arg) == IS_NULL) { + if (check_null && Z_TYPE_P(arg) == IS_NULL) { *pce = NULL; break; } convert_to_string_ex(arg); - if (zend_lookup_class(Z_STRVAL_PP(arg), Z_STRLEN_PP(arg), &lookup TSRMLS_CC) == FAILURE) { + if ((lookup = zend_lookup_class(Z_STR_P(arg) TSRMLS_CC)) == NULL) { *pce = NULL; } else { - *pce = *lookup; + *pce = lookup; } if (ce_base) { if ((!*pce || !instanceof_function(*pce, ce_base TSRMLS_CC))) { zend_spprintf(error, 0, "to be a class name derived from %s, '%s' given", - ce_base->name, Z_STRVAL_PP(arg)); + ce_base->name->val, Z_STRVAL_P(arg)); *pce = NULL; return ""; } } if (!*pce) { zend_spprintf(error, 0, "to be a valid class name, '%s' given", - Z_STRVAL_PP(arg)); + Z_STRVAL_P(arg)); return ""; } break; @@ -623,13 +725,13 @@ static const char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, con zend_fcall_info_cache *fcc = va_arg(*va, zend_fcall_info_cache *); char *is_callable_error = NULL; - if (check_null && Z_TYPE_PP(arg) == IS_NULL) { + if (check_null && Z_TYPE_P(arg) == IS_NULL) { fci->size = 0; fcc->initialized = 0; break; } - if (zend_fcall_info_init(*arg, 0, fci, fcc, NULL, &is_callable_error TSRMLS_CC) == SUCCESS) { + if (zend_fcall_info_init(arg, 0, fci, fcc, NULL, &is_callable_error TSRMLS_CC) == SUCCESS) { if (is_callable_error) { *severity = E_STRICT; zend_spprintf(error, 0, "to be a valid callback, %s", is_callable_error); @@ -653,25 +755,17 @@ static const char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, con case 'z': { zval **p = va_arg(*va, zval **); - if (check_null && Z_TYPE_PP(arg) == IS_NULL) { + if (check_null && Z_TYPE_P(arg) == IS_NULL) { *p = NULL; } else { - *p = *arg; + *p = real_arg; } } break; case 'Z': - { - zval ***p = va_arg(*va, zval ***); - if (check_null && Z_TYPE_PP(arg) == IS_NULL) { - *p = NULL; - } else { - *p = arg; - } - } - break; - + /* 'Z' iz not supported anymore and should be replaced with 'z' */ + ZEND_ASSERT(c != 'Z'); default: return "unknown"; } @@ -682,7 +776,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, con } /* }}} */ -static int zend_parse_arg(int arg_num, zval **arg, va_list *va, const char **spec, int quiet TSRMLS_DC) /* {{{ */ +static int zend_parse_arg(int arg_num, zval *arg, va_list *va, const char **spec, int quiet TSRMLS_DC) /* {{{ */ { const char *expected_type = NULL; char *error = NULL; @@ -701,7 +795,7 @@ static int zend_parse_arg(int arg_num, zval **arg, va_list *va, const char **spe } else { zend_error(severity, "%s%s%s() expects parameter %d to be %s, %s given", class_name, space, get_active_function_name(TSRMLS_C), arg_num, expected_type, - zend_zval_type_name(*arg)); + zend_zval_type_name(arg)); } } if (severity != E_STRICT) { @@ -713,7 +807,7 @@ static int zend_parse_arg(int arg_num, zval **arg, va_list *va, const char **spe } /* }}} */ -ZEND_API int zend_parse_parameter(int flags, int arg_num TSRMLS_DC, zval **arg, const char *spec, ...) +ZEND_API int zend_parse_parameter(int flags, int arg_num TSRMLS_DC, zval *arg, const char *spec, ...) { va_list va; int ret; @@ -733,11 +827,11 @@ static int zend_parse_va_args(int num_args, const char *type_spec, va_list *va, int min_num_args = -1; int max_num_args = 0; int post_varargs = 0; - zval **arg; + zval *arg; int arg_count; int quiet = flags & ZEND_PARSE_PARAMS_QUIET; zend_bool have_varargs = 0; - zval ****varargs = NULL; + zval **varargs = NULL; int *n_varargs = NULL; for (spec_walk = type_spec; *spec_walk; spec_walk++) { @@ -751,6 +845,8 @@ static int zend_parse_va_args(int num_args, const char *type_spec, va_list *va, case 'C': case 'h': case 'f': case 'A': case 'H': case 'p': + case 'S': case 'P': + case 'L': max_num_args++; break; @@ -767,12 +863,12 @@ static int zend_parse_va_args(int num_args, const char *type_spec, va_list *va, case '+': if (have_varargs) { if (!quiet) { - zend_function *active_function = EG(current_execute_data)->function_state.function; - const char *class_name = active_function->common.scope ? active_function->common.scope->name : ""; + zend_function *active_function = EG(current_execute_data)->func; + const char *class_name = active_function->common.scope ? active_function->common.scope->name->val : ""; zend_error(E_WARNING, "%s%s%s(): only one varargs specifier (* or +) is permitted", class_name, class_name[0] ? "::" : "", - active_function->common.function_name); + active_function->common.function_name->val); } return FAILURE; } @@ -787,12 +883,12 @@ static int zend_parse_va_args(int num_args, const char *type_spec, va_list *va, default: if (!quiet) { - zend_function *active_function = EG(current_execute_data)->function_state.function; - const char *class_name = active_function->common.scope ? active_function->common.scope->name : ""; + zend_function *active_function = EG(current_execute_data)->func; + const char *class_name = active_function->common.scope ? active_function->common.scope->name->val : ""; zend_error(E_WARNING, "%s%s%s(): bad type specifier while parsing parameters", class_name, class_name[0] ? "::" : "", - active_function->common.function_name); + active_function->common.function_name->val); } return FAILURE; } @@ -810,12 +906,12 @@ static int zend_parse_va_args(int num_args, const char *type_spec, va_list *va, if (num_args < min_num_args || (num_args > max_num_args && max_num_args > 0)) { if (!quiet) { - zend_function *active_function = EG(current_execute_data)->function_state.function; - const char *class_name = active_function->common.scope ? active_function->common.scope->name : ""; + zend_function *active_function = EG(current_execute_data)->func; + const char *class_name = active_function->common.scope ? active_function->common.scope->name->val : ""; zend_error(E_WARNING, "%s%s%s() expects %s %d parameter%s, %d given", class_name, class_name[0] ? "::" : "", - active_function->common.function_name, + active_function->common.function_name->val, min_num_args == max_num_args ? "exactly" : num_args < min_num_args ? "at least" : "at most", num_args < min_num_args ? min_num_args : max_num_args, (num_args < min_num_args ? min_num_args : max_num_args) == 1 ? "" : "s", @@ -824,7 +920,7 @@ static int zend_parse_va_args(int num_args, const char *type_spec, va_list *va, return FAILURE; } - arg_count = (int)(zend_uintptr_t) *(zend_vm_stack_top(TSRMLS_C) - 1); + arg_count = EG(current_execute_data)->num_args; if (num_args > arg_count) { zend_error(E_WARNING, "%s(): could not obtain parameters for parsing", @@ -842,25 +938,16 @@ static int zend_parse_va_args(int num_args, const char *type_spec, va_list *va, int num_varargs = num_args + 1 - post_varargs; /* eat up the passed in storage even if it won't be filled in with varargs */ - varargs = va_arg(*va, zval ****); + varargs = va_arg(*va, zval **); n_varargs = va_arg(*va, int *); type_spec++; if (num_varargs > 0) { - int iv = 0; - zval **p = (zval **) (zend_vm_stack_top(TSRMLS_C) - 1 - (arg_count - i)); - *n_varargs = num_varargs; - - /* allocate space for array and store args */ - *varargs = safe_emalloc(num_varargs, sizeof(zval **), 0); - while (num_varargs-- > 0) { - (*varargs)[iv++] = p++; - } - + *varargs = ZEND_CALL_ARG(EG(current_execute_data), i + 1); /* adjust how many args we have left and restart loop */ - num_args = num_args + 1 - iv; - i += iv; + num_args += 1 - num_varargs; + i += num_varargs; continue; } else { *varargs = NULL; @@ -868,12 +955,11 @@ static int zend_parse_va_args(int num_args, const char *type_spec, va_list *va, } } - arg = (zval **) (zend_vm_stack_top(TSRMLS_C) - 1 - (arg_count-i)); + arg = ZEND_CALL_ARG(EG(current_execute_data), i + 1); if (zend_parse_arg(i+1, arg, va, &type_spec, quiet TSRMLS_CC) == FAILURE) { /* clean up varargs array if it was used */ if (varargs && *varargs) { - efree(*varargs); *varargs = NULL; } return FAILURE; @@ -936,7 +1022,12 @@ ZEND_API int zend_parse_method_parameters(int num_args TSRMLS_DC, zval *this_ptr zval **object; zend_class_entry *ce; - if (!this_ptr) { + /* Just checking this_ptr is not enough, because fcall_common_helper does not set + * Z_OBJ(EG(This)) to NULL when calling an internal function with common.scope == NULL. + * In that case EG(This) would still be the $this from the calling code and we'd take the + * wrong branch here. */ + zend_bool is_method = EG(current_execute_data)->func->common.scope != NULL; + if (!is_method || !this_ptr || Z_TYPE_P(this_ptr) != IS_OBJECT) { RETURN_IF_ZERO_ARGS(num_args, p, 0); va_start(va, type_spec); @@ -954,7 +1045,7 @@ ZEND_API int zend_parse_method_parameters(int num_args TSRMLS_DC, zval *this_ptr if (ce && !instanceof_function(Z_OBJCE_P(this_ptr), ce TSRMLS_CC)) { zend_error(E_CORE_ERROR, "%s::%s() must be derived from %s::%s", - ce->name, get_active_function_name(TSRMLS_C), Z_OBJCE_P(this_ptr)->name, get_active_function_name(TSRMLS_C)); + Z_OBJCE_P(this_ptr)->name->val, get_active_function_name(TSRMLS_C), ce->name->val, get_active_function_name(TSRMLS_C)); } retval = zend_parse_va_args(num_args, p, &va, 0 TSRMLS_CC); @@ -992,7 +1083,7 @@ ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args TSRMLS_DC, if (ce && !instanceof_function(Z_OBJCE_P(this_ptr), ce TSRMLS_CC)) { if (!quiet) { zend_error(E_CORE_ERROR, "%s::%s() must be derived from %s::%s", - ce->name, get_active_function_name(TSRMLS_C), Z_OBJCE_P(this_ptr)->name, get_active_function_name(TSRMLS_C)); + ce->name->val, get_active_function_name(TSRMLS_C), Z_OBJCE_P(this_ptr)->name->val, get_active_function_name(TSRMLS_C)); } va_end(va); return FAILURE; @@ -1008,79 +1099,61 @@ ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args TSRMLS_DC, /* Argument parsing API -- andrei */ ZEND_API int _array_init(zval *arg, uint size ZEND_FILE_LINE_DC) /* {{{ */ { - ALLOC_HASHTABLE_REL(Z_ARRVAL_P(arg)); - - _zend_hash_init(Z_ARRVAL_P(arg), size, NULL, ZVAL_PTR_DTOR, 0 ZEND_FILE_LINE_RELAY_CC); - Z_TYPE_P(arg) = IS_ARRAY; + ZVAL_NEW_ARR(arg); + _zend_hash_init(Z_ARRVAL_P(arg), size, ZVAL_PTR_DTOR, 0 ZEND_FILE_LINE_RELAY_CC); return SUCCESS; } /* }}} */ -static int zend_merge_property(zval **value TSRMLS_DC, int num_args, va_list args, const zend_hash_key *hash_key) /* {{{ */ -{ - /* which name should a numeric property have ? */ - if (hash_key->nKeyLength) { - zval *obj = va_arg(args, zval *); - zend_object_handlers *obj_ht = va_arg(args, zend_object_handlers *); - zval *member; - - MAKE_STD_ZVAL(member); - ZVAL_STRINGL(member, hash_key->arKey, hash_key->nKeyLength-1, 1); - obj_ht->write_property(obj, member, *value, 0 TSRMLS_CC); - zval_ptr_dtor(&member); - } - return ZEND_HASH_APPLY_KEEP; -} -/* }}} */ - /* This function should be called after the constructor has been called * because it may call __set from the uninitialized object otherwise. */ -ZEND_API void zend_merge_properties(zval *obj, HashTable *properties, int destroy_ht TSRMLS_DC) /* {{{ */ +ZEND_API void zend_merge_properties(zval *obj, HashTable *properties TSRMLS_DC) /* {{{ */ { const zend_object_handlers *obj_ht = Z_OBJ_HT_P(obj); zend_class_entry *old_scope = EG(scope); + zend_string *key; + zval *value; EG(scope) = Z_OBJCE_P(obj); - zend_hash_apply_with_arguments(properties TSRMLS_CC, (apply_func_args_t)zend_merge_property, 2, obj, obj_ht); - EG(scope) = old_scope; + ZEND_HASH_FOREACH_STR_KEY_VAL(properties, key, value) { + if (key) { + zval member; - if (destroy_ht) { - zend_hash_destroy(properties); - FREE_HASHTABLE(properties); - } + ZVAL_STR(&member, key); + obj_ht->write_property(obj, &member, value, NULL TSRMLS_CC); + } + } ZEND_HASH_FOREACH_END(); + EG(scope) = old_scope; } /* }}} */ -static int zval_update_class_constant(zval **pp, int is_static, int offset TSRMLS_DC) /* {{{ */ +static int zval_update_class_constant(zval *pp, int is_static, int offset TSRMLS_DC) /* {{{ */ { - if ((Z_TYPE_PP(pp) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT || - (Z_TYPE_PP(pp) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT_ARRAY) { - zend_class_entry **scope = EG(in_execution)?&EG(scope):&CG(active_class_entry); + ZVAL_DEREF(pp); + if (Z_CONSTANT_P(pp)) { + zend_class_entry **scope = EG(current_execute_data) ? &EG(scope) : &CG(active_class_entry); if ((*scope)->parent) { zend_class_entry *ce = *scope; - HashPosition pos; zend_property_info *prop_info; do { - for (zend_hash_internal_pointer_reset_ex(&ce->properties_info, &pos); - zend_hash_get_current_data_ex(&ce->properties_info, (void **) &prop_info, &pos) == SUCCESS; - zend_hash_move_forward_ex(&ce->properties_info, &pos)) { + ZEND_HASH_FOREACH_PTR(&ce->properties_info, prop_info) { if (is_static == ((prop_info->flags & ZEND_ACC_STATIC) != 0) && offset == prop_info->offset) { int ret; zend_class_entry *old_scope = *scope; *scope = prop_info->ce; - ret = zval_update_constant(pp, (void*)1 TSRMLS_CC); + ret = zval_update_constant(pp, 1 TSRMLS_CC); *scope = old_scope; return ret; } - } + } ZEND_HASH_FOREACH_END(); ce = ce->parent; } while (ce); - + } - return zval_update_constant(pp, (void*)1 TSRMLS_CC); + return zval_update_constant(pp, 1 TSRMLS_CC); } return 0; } @@ -1088,53 +1161,53 @@ static int zval_update_class_constant(zval **pp, int is_static, int offset TSRML ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC) /* {{{ */ { - if ((class_type->ce_flags & ZEND_ACC_CONSTANTS_UPDATED) == 0 || (!CE_STATIC_MEMBERS(class_type) && class_type->default_static_members_count)) { - zend_class_entry **scope = EG(in_execution)?&EG(scope):&CG(active_class_entry); - zend_class_entry *old_scope = *scope; - int i; + int i; - *scope = class_type; - zend_hash_apply_with_argument(&class_type->constants_table, (apply_func_arg_t) zval_update_constant, (void*)1 TSRMLS_CC); + /* initialize static members of internal class */ + if (!CE_STATIC_MEMBERS(class_type) && class_type->default_static_members_count) { + zval *p; - for (i = 0; i < class_type->default_properties_count; i++) { - if (class_type->default_properties_table[i]) { - zval_update_class_constant(&class_type->default_properties_table[i], 0, i TSRMLS_CC); - } + if (class_type->parent) { + zend_update_class_constants(class_type->parent TSRMLS_CC); } - - if (!CE_STATIC_MEMBERS(class_type) && class_type->default_static_members_count) { - zval **p; - - if (class_type->parent) { - zend_update_class_constants(class_type->parent TSRMLS_CC); - } #if ZTS - CG(static_members_table)[(zend_intptr_t)(class_type->static_members_table)] = emalloc(sizeof(zval*) * class_type->default_static_members_count); + CG(static_members_table)[(zend_intptr_t)(class_type->static_members_table)] = emalloc(sizeof(zval*) * class_type->default_static_members_count); #else - class_type->static_members_table = emalloc(sizeof(zval*) * class_type->default_static_members_count); + class_type->static_members_table = emalloc(sizeof(zval*) * class_type->default_static_members_count); #endif - for (i = 0; i < class_type->default_static_members_count; i++) { - p = &class_type->default_static_members_table[i]; - if (Z_ISREF_PP(p) && - class_type->parent && - i < class_type->parent->default_static_members_count && - *p == class_type->parent->default_static_members_table[i] && - CE_STATIC_MEMBERS(class_type->parent)[i] - ) { - zval *q = CE_STATIC_MEMBERS(class_type->parent)[i]; - - Z_ADDREF_P(q); - Z_SET_ISREF_P(q); - CE_STATIC_MEMBERS(class_type)[i] = q; - } else { - zval *r; + for (i = 0; i < class_type->default_static_members_count; i++) { + p = &class_type->default_static_members_table[i]; + if (Z_ISREF_P(p) && + class_type->parent && + i < class_type->parent->default_static_members_count && + p == &class_type->parent->default_static_members_table[i] && + Z_TYPE(CE_STATIC_MEMBERS(class_type->parent)[i]) != IS_UNDEF + ) { + zval *q = &CE_STATIC_MEMBERS(class_type->parent)[i]; + + ZVAL_NEW_REF(q, q); + ZVAL_COPY_VALUE(&CE_STATIC_MEMBERS(class_type)[i], q); + Z_ADDREF_P(q); + } else { + ZVAL_DUP(&CE_STATIC_MEMBERS(class_type)[i], p); + } + } + } - ALLOC_ZVAL(r); - *r = **p; - INIT_PZVAL(r); - zval_copy_ctor(r); - CE_STATIC_MEMBERS(class_type)[i] = r; - } + if ((class_type->ce_flags & ZEND_ACC_CONSTANTS_UPDATED) == 0) { + zend_class_entry **scope = EG(current_execute_data) ? &EG(scope) : &CG(active_class_entry); + zend_class_entry *old_scope = *scope; + zval *val; + + *scope = class_type; + + ZEND_HASH_FOREACH_VAL(&class_type->constants_table, val) { + zval_update_constant(val, 1 TSRMLS_CC); + } ZEND_HASH_FOREACH_END(); + + for (i = 0; i < class_type->default_properties_count; i++) { + if (Z_TYPE(class_type->default_properties_table[i]) != IS_UNDEF) { + zval_update_class_constant(&class_type->default_properties_table[i], 0, i TSRMLS_CC); } } @@ -1153,51 +1226,92 @@ ZEND_API void object_properties_init(zend_object *object, zend_class_entry *clas int i; if (class_type->default_properties_count) { - object->properties_table = emalloc(sizeof(zval*) * class_type->default_properties_count); for (i = 0; i < class_type->default_properties_count; i++) { - object->properties_table[i] = class_type->default_properties_table[i]; - if (class_type->default_properties_table[i]) { #if ZTS - ALLOC_ZVAL( object->properties_table[i]); - MAKE_COPY_ZVAL(&class_type->default_properties_table[i], object->properties_table[i]); + ZVAL_DUP(&object->properties_table[i], &class_type->default_properties_table[i]); #else - Z_ADDREF_P(object->properties_table[i]); + ZVAL_COPY(&object->properties_table[i], &class_type->default_properties_table[i]); #endif - } } object->properties = NULL; } } /* }}} */ +ZEND_API void object_properties_init_ex(zend_object *object, HashTable *properties TSRMLS_DC) /* {{{ */ +{ + object->properties = properties; + if (object->ce->default_properties_count) { + zval *prop; + zend_string *key; + zend_property_info *property_info; + + ZEND_HASH_FOREACH_STR_KEY_VAL(properties, key, prop) { + property_info = zend_get_property_info(object->ce, key, 1 TSRMLS_CC); + if (property_info != ZEND_WRONG_PROPERTY_INFO && + property_info && + (property_info->flags & ZEND_ACC_STATIC) == 0) { + ZVAL_COPY_VALUE(&object->properties_table[property_info->offset], prop); + ZVAL_INDIRECT(prop, &object->properties_table[property_info->offset]); + } + } ZEND_HASH_FOREACH_END(); + } +} +/* }}} */ + +ZEND_API void object_properties_load(zend_object *object, HashTable *properties TSRMLS_DC) /* {{{ */ +{ + zval *prop, tmp; + zend_string *key; + zend_property_info *property_info; + + ZEND_HASH_FOREACH_STR_KEY_VAL(properties, key, prop) { + property_info = zend_get_property_info(object->ce, key, 1 TSRMLS_CC); + if (property_info != ZEND_WRONG_PROPERTY_INFO && + property_info && + (property_info->flags & ZEND_ACC_STATIC) == 0) { + zval_ptr_dtor(&object->properties_table[property_info->offset]); + ZVAL_COPY_VALUE(&object->properties_table[property_info->offset], prop); + zval_add_ref(&object->properties_table[property_info->offset]); + if (object->properties) { + ZVAL_INDIRECT(&tmp, &object->properties_table[property_info->offset]); + zend_hash_update(object->properties, key, &tmp); + } + } else { + if (!object->properties) { + rebuild_object_properties(object); + } + prop = zend_hash_update(object->properties, key, prop); + zval_add_ref(prop); + } + } ZEND_HASH_FOREACH_END(); +} +/* }}} */ + /* This function requires 'properties' to contain all props declared in the * class and all props being public. If only a subset is given or the class * has protected members then you need to merge the properties separately by * calling zend_merge_properties(). */ ZEND_API int _object_and_properties_init(zval *arg, zend_class_entry *class_type, HashTable *properties ZEND_FILE_LINE_DC TSRMLS_DC) /* {{{ */ { - zend_object *object; - if (class_type->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) { char *what = (class_type->ce_flags & ZEND_ACC_INTERFACE) ? "interface" :((class_type->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) ? "trait" : "abstract class"; - zend_error(E_ERROR, "Cannot instantiate %s %s", what, class_type->name); + zend_error(E_ERROR, "Cannot instantiate %s %s", what, class_type->name->val); } zend_update_class_constants(class_type TSRMLS_CC); - Z_TYPE_P(arg) = IS_OBJECT; if (class_type->create_object == NULL) { - Z_OBJVAL_P(arg) = zend_objects_new(&object, class_type TSRMLS_CC); + ZVAL_OBJ(arg, zend_objects_new(class_type TSRMLS_CC)); if (properties) { - object->properties = properties; - object->properties_table = NULL; + object_properties_init_ex(Z_OBJ_P(arg), properties TSRMLS_CC); } else { - object_properties_init(object, class_type); + object_properties_init(Z_OBJ_P(arg), class_type); } } else { - Z_OBJVAL_P(arg) = class_type->create_object(class_type TSRMLS_CC); + ZVAL_OBJ(arg, class_type->create_object(class_type TSRMLS_CC)); } return SUCCESS; } @@ -1222,385 +1336,381 @@ ZEND_API int add_assoc_function(zval *arg, const char *key, void (*function_ptr) } /* }}} */ -ZEND_API int add_assoc_long_ex(zval *arg, const char *key, uint key_len, long n) /* {{{ */ +ZEND_API int add_assoc_long_ex(zval *arg, const char *key, uint key_len, zend_long n) /* {{{ */ { - zval *tmp; - - MAKE_STD_ZVAL(tmp); - ZVAL_LONG(tmp, n); - - return zend_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL); + zval *ret, tmp; + + ZVAL_LONG(&tmp, n); + ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); + return ret ? SUCCESS : FAILURE; } /* }}} */ ZEND_API int add_assoc_null_ex(zval *arg, const char *key, uint key_len) /* {{{ */ { - zval *tmp; - - MAKE_STD_ZVAL(tmp); - ZVAL_NULL(tmp); - - return zend_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL); + zval *ret, tmp; + + ZVAL_NULL(&tmp); + ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); + return ret ? SUCCESS : FAILURE; } /* }}} */ ZEND_API int add_assoc_bool_ex(zval *arg, const char *key, uint key_len, int b) /* {{{ */ { - zval *tmp; - - MAKE_STD_ZVAL(tmp); - ZVAL_BOOL(tmp, b); - - return zend_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL); + zval *ret, tmp; + + ZVAL_BOOL(&tmp, b); + ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); + return ret ? SUCCESS : FAILURE; } /* }}} */ -ZEND_API int add_assoc_resource_ex(zval *arg, const char *key, uint key_len, int r) /* {{{ */ +ZEND_API int add_assoc_resource_ex(zval *arg, const char *key, uint key_len, zend_resource *r) /* {{{ */ { - zval *tmp; - - MAKE_STD_ZVAL(tmp); - ZVAL_RESOURCE(tmp, r); - - return zend_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL); + zval *ret, tmp; + + ZVAL_RES(&tmp, r); + ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); + return ret ? SUCCESS : FAILURE; } /* }}} */ ZEND_API int add_assoc_double_ex(zval *arg, const char *key, uint key_len, double d) /* {{{ */ { - zval *tmp; - - MAKE_STD_ZVAL(tmp); - ZVAL_DOUBLE(tmp, d); - - return zend_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL); + zval *ret, tmp; + + ZVAL_DOUBLE(&tmp, d); + ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); + return ret ? SUCCESS : FAILURE; } /* }}} */ -ZEND_API int add_assoc_string_ex(zval *arg, const char *key, uint key_len, char *str, int duplicate) /* {{{ */ +ZEND_API int add_assoc_str_ex(zval *arg, const char *key, uint key_len, zend_string *str) /* {{{ */ { - zval *tmp; - - MAKE_STD_ZVAL(tmp); - ZVAL_STRING(tmp, str, duplicate); + zval *ret, tmp; - return zend_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL); + ZVAL_STR(&tmp, str); + ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); + return ret ? SUCCESS : FAILURE; } /* }}} */ -ZEND_API int add_assoc_stringl_ex(zval *arg, const char *key, uint key_len, char *str, uint length, int duplicate) /* {{{ */ +ZEND_API int add_assoc_string_ex(zval *arg, const char *key, uint key_len, char *str) /* {{{ */ { - zval *tmp; - - MAKE_STD_ZVAL(tmp); - ZVAL_STRINGL(tmp, str, length, duplicate); + zval *ret, tmp; + + ZVAL_STRING(&tmp, str); + ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); + return ret ? SUCCESS : FAILURE; +} +/* }}} */ - return zend_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL); +ZEND_API int add_assoc_stringl_ex(zval *arg, const char *key, uint key_len, char *str, size_t length) /* {{{ */ +{ + zval *ret, tmp; + + ZVAL_STRINGL(&tmp, str, length); + ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); + return ret ? SUCCESS : FAILURE; } /* }}} */ ZEND_API int add_assoc_zval_ex(zval *arg, const char *key, uint key_len, zval *value) /* {{{ */ { - return zend_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void *) &value, sizeof(zval *), NULL); + zval *ret; + + ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, value); + return ret ? SUCCESS : FAILURE; } /* }}} */ -ZEND_API int add_index_long(zval *arg, ulong index, long n) /* {{{ */ +ZEND_API int add_index_long(zval *arg, zend_ulong index, zend_long n) /* {{{ */ { - zval *tmp; - - MAKE_STD_ZVAL(tmp); - ZVAL_LONG(tmp, n); + zval tmp; - return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &tmp, sizeof(zval *), NULL); + ZVAL_LONG(&tmp, n); + return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp) ? SUCCESS : FAILURE; } /* }}} */ -ZEND_API int add_index_null(zval *arg, ulong index) /* {{{ */ +ZEND_API int add_index_null(zval *arg, zend_ulong index) /* {{{ */ { - zval *tmp; + zval tmp; - MAKE_STD_ZVAL(tmp); - ZVAL_NULL(tmp); - - return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &tmp, sizeof(zval *), NULL); + ZVAL_NULL(&tmp); + return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp) ? SUCCESS : FAILURE; } /* }}} */ -ZEND_API int add_index_bool(zval *arg, ulong index, int b) /* {{{ */ +ZEND_API int add_index_bool(zval *arg, zend_ulong index, int b) /* {{{ */ { - zval *tmp; - - MAKE_STD_ZVAL(tmp); - ZVAL_BOOL(tmp, b); + zval tmp; - return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &tmp, sizeof(zval *), NULL); + ZVAL_BOOL(&tmp, b); + return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp) ? SUCCESS : FAILURE; } /* }}} */ -ZEND_API int add_index_resource(zval *arg, ulong index, int r) /* {{{ */ +ZEND_API int add_index_resource(zval *arg, zend_ulong index, zend_resource *r) /* {{{ */ { - zval *tmp; + zval tmp; - MAKE_STD_ZVAL(tmp); - ZVAL_RESOURCE(tmp, r); - - return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &tmp, sizeof(zval *), NULL); + ZVAL_RES(&tmp, r); + return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp) ? SUCCESS : FAILURE; } /* }}} */ -ZEND_API int add_index_double(zval *arg, ulong index, double d) /* {{{ */ +ZEND_API int add_index_double(zval *arg, zend_ulong index, double d) /* {{{ */ { - zval *tmp; - - MAKE_STD_ZVAL(tmp); - ZVAL_DOUBLE(tmp, d); + zval tmp; - return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &tmp, sizeof(zval *), NULL); + ZVAL_DOUBLE(&tmp, d); + return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp) ? SUCCESS : FAILURE; } /* }}} */ -ZEND_API int add_index_string(zval *arg, ulong index, const char *str, int duplicate) /* {{{ */ +ZEND_API int add_index_str(zval *arg, zend_ulong index, zend_string *str) /* {{{ */ { - zval *tmp; + zval tmp; - MAKE_STD_ZVAL(tmp); - ZVAL_STRING(tmp, str, duplicate); - - return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &tmp, sizeof(zval *), NULL); + ZVAL_STR(&tmp, str); + return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp) ? SUCCESS : FAILURE; } /* }}} */ -ZEND_API int add_index_stringl(zval *arg, ulong index, const char *str, uint length, int duplicate) /* {{{ */ +ZEND_API int add_index_string(zval *arg, zend_ulong index, const char *str) /* {{{ */ { - zval *tmp; - - MAKE_STD_ZVAL(tmp); - ZVAL_STRINGL(tmp, str, length, duplicate); + zval tmp; - return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &tmp, sizeof(zval *), NULL); + ZVAL_STRING(&tmp, str); + return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp) ? SUCCESS : FAILURE; } /* }}} */ -ZEND_API int add_index_zval(zval *arg, ulong index, zval *value) /* {{{ */ +ZEND_API int add_index_stringl(zval *arg, zend_ulong index, const char *str, size_t length) /* {{{ */ { - return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &value, sizeof(zval *), NULL); + zval tmp; + + ZVAL_STRINGL(&tmp, str, length); + return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp) ? SUCCESS : FAILURE; } /* }}} */ -ZEND_API int add_next_index_long(zval *arg, long n) /* {{{ */ +ZEND_API int add_index_zval(zval *arg, zend_ulong index, zval *value) /* {{{ */ { - zval *tmp; + return zend_hash_index_update(Z_ARRVAL_P(arg), index, value) ? SUCCESS : FAILURE; +} +/* }}} */ - MAKE_STD_ZVAL(tmp); - ZVAL_LONG(tmp, n); +ZEND_API int add_next_index_long(zval *arg, zend_long n) /* {{{ */ +{ + zval tmp; - return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp, sizeof(zval *), NULL); + ZVAL_LONG(&tmp, n); + return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE; } /* }}} */ ZEND_API int add_next_index_null(zval *arg) /* {{{ */ { - zval *tmp; - - MAKE_STD_ZVAL(tmp); - ZVAL_NULL(tmp); + zval tmp; - return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp, sizeof(zval *), NULL); + ZVAL_NULL(&tmp); + return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE; } /* }}} */ ZEND_API int add_next_index_bool(zval *arg, int b) /* {{{ */ { - zval *tmp; + zval tmp; - MAKE_STD_ZVAL(tmp); - ZVAL_BOOL(tmp, b); - - return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp, sizeof(zval *), NULL); + ZVAL_BOOL(&tmp, b); + return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE; } /* }}} */ -ZEND_API int add_next_index_resource(zval *arg, int r) /* {{{ */ +ZEND_API int add_next_index_resource(zval *arg, zend_resource *r) /* {{{ */ { - zval *tmp; - - MAKE_STD_ZVAL(tmp); - ZVAL_RESOURCE(tmp, r); + zval tmp; - return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp, sizeof(zval *), NULL); + ZVAL_RES(&tmp, r); + return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE; } /* }}} */ ZEND_API int add_next_index_double(zval *arg, double d) /* {{{ */ { - zval *tmp; - - MAKE_STD_ZVAL(tmp); - ZVAL_DOUBLE(tmp, d); + zval tmp; - return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp, sizeof(zval *), NULL); + ZVAL_DOUBLE(&tmp, d); + return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE; } /* }}} */ -ZEND_API int add_next_index_string(zval *arg, const char *str, int duplicate) /* {{{ */ +ZEND_API int add_next_index_str(zval *arg, zend_string *str) /* {{{ */ { - zval *tmp; + zval tmp; - MAKE_STD_ZVAL(tmp); - ZVAL_STRING(tmp, str, duplicate); - - return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp, sizeof(zval *), NULL); + ZVAL_STR(&tmp, str); + return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE; } /* }}} */ -ZEND_API int add_next_index_stringl(zval *arg, const char *str, uint length, int duplicate) /* {{{ */ +ZEND_API int add_next_index_string(zval *arg, const char *str) /* {{{ */ { - zval *tmp; + zval tmp; - MAKE_STD_ZVAL(tmp); - ZVAL_STRINGL(tmp, str, length, duplicate); + ZVAL_STRING(&tmp, str); + return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE; +} +/* }}} */ - return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp, sizeof(zval *), NULL); +ZEND_API int add_next_index_stringl(zval *arg, const char *str, size_t length) /* {{{ */ +{ + zval tmp; + + ZVAL_STRINGL(&tmp, str, length); + return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE; } /* }}} */ ZEND_API int add_next_index_zval(zval *arg, zval *value) /* {{{ */ { - return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &value, sizeof(zval *), NULL); + return zend_hash_next_index_insert(Z_ARRVAL_P(arg), value) ? SUCCESS : FAILURE; } /* }}} */ -ZEND_API int add_get_assoc_string_ex(zval *arg, const char *key, uint key_len, const char *str, void **dest, int duplicate) /* {{{ */ +ZEND_API zval *add_get_assoc_string_ex(zval *arg, const char *key, uint key_len, const char *str) /* {{{ */ { - zval *tmp; - - MAKE_STD_ZVAL(tmp); - ZVAL_STRING(tmp, str, duplicate); + zval tmp, *ret; - return zend_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), dest); + ZVAL_STRING(&tmp, str); + ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); + return ret; } /* }}} */ -ZEND_API int add_get_assoc_stringl_ex(zval *arg, const char *key, uint key_len, const char *str, uint length, void **dest, int duplicate) /* {{{ */ +ZEND_API zval *add_get_assoc_stringl_ex(zval *arg, const char *key, uint key_len, const char *str, size_t length) /* {{{ */ { - zval *tmp; + zval tmp, *ret; - MAKE_STD_ZVAL(tmp); - ZVAL_STRINGL(tmp, str, length, duplicate); - - return zend_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), dest); + ZVAL_STRINGL(&tmp, str, length); + ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); + return ret; } /* }}} */ -ZEND_API int add_get_index_long(zval *arg, ulong index, long l, void **dest) /* {{{ */ +ZEND_API zval *add_get_index_long(zval *arg, zend_ulong index, zend_long l) /* {{{ */ { - zval *tmp; + zval tmp; - MAKE_STD_ZVAL(tmp); - ZVAL_LONG(tmp, l); - - return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &tmp, sizeof(zval *), dest); + ZVAL_LONG(&tmp, l); + return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); } /* }}} */ -ZEND_API int add_get_index_double(zval *arg, ulong index, double d, void **dest) /* {{{ */ +ZEND_API zval *add_get_index_double(zval *arg, zend_ulong index, double d) /* {{{ */ { - zval *tmp; - - MAKE_STD_ZVAL(tmp); - ZVAL_DOUBLE(tmp, d); + zval tmp; - return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &tmp, sizeof(zval *), dest); + ZVAL_DOUBLE(&tmp, d); + return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); } /* }}} */ -ZEND_API int add_get_index_string(zval *arg, ulong index, const char *str, void **dest, int duplicate) /* {{{ */ +ZEND_API zval *add_get_index_str(zval *arg, zend_ulong index, zend_string *str) /* {{{ */ { - zval *tmp; + zval tmp; - MAKE_STD_ZVAL(tmp); - ZVAL_STRING(tmp, str, duplicate); - - return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &tmp, sizeof(zval *), dest); + ZVAL_STR(&tmp, str); + return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); } /* }}} */ -ZEND_API int add_get_index_stringl(zval *arg, ulong index, const char *str, uint length, void **dest, int duplicate) /* {{{ */ +ZEND_API zval *add_get_index_string(zval *arg, zend_ulong index, const char *str) /* {{{ */ { - zval *tmp; + zval tmp; - MAKE_STD_ZVAL(tmp); - ZVAL_STRINGL(tmp, str, length, duplicate); + ZVAL_STRING(&tmp, str); + return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); +} +/* }}} */ - return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &tmp, sizeof(zval *), dest); +ZEND_API zval *add_get_index_stringl(zval *arg, zend_ulong index, const char *str, size_t length) /* {{{ */ +{ + zval tmp; + + ZVAL_STRINGL(&tmp, str, length); + return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); } /* }}} */ -ZEND_API int array_set_zval_key(HashTable *ht, zval *key, zval *value) /* {{{ */ +ZEND_API int array_set_zval_key(HashTable *ht, zval *key, zval *value TSRMLS_DC) /* {{{ */ { - int result; + zval *result; switch (Z_TYPE_P(key)) { case IS_STRING: - result = zend_symtable_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &value, sizeof(zval *), NULL); + result = zend_symtable_update(ht, Z_STR_P(key), value); break; case IS_NULL: - result = zend_symtable_update(ht, "", 1, &value, sizeof(zval *), NULL); + result = zend_symtable_update(ht, STR_EMPTY_ALLOC(), value); break; case IS_RESOURCE: - zend_error(E_STRICT, "Resource ID#%ld used as offset, casting to integer (%ld)", Z_LVAL_P(key), Z_LVAL_P(key)); - /* break missing intentionally */ - case IS_BOOL: + zend_error(E_STRICT, "Resource ID#" ZEND_LONG_FMT " used as offset, casting to integer (%pd)", Z_RES_HANDLE_P(key), Z_RES_HANDLE_P(key)); + result = zend_hash_index_update(ht, Z_RES_HANDLE_P(key), value); + break; + case IS_FALSE: + result = zend_hash_index_update(ht, 0, value); + break; + case IS_TRUE: + result = zend_hash_index_update(ht, 1, value); + break; case IS_LONG: - result = zend_hash_index_update(ht, Z_LVAL_P(key), &value, sizeof(zval *), NULL); + result = zend_hash_index_update(ht, Z_LVAL_P(key), value); break; case IS_DOUBLE: - result = zend_hash_index_update(ht, zend_dval_to_lval(Z_DVAL_P(key)), &value, sizeof(zval *), NULL); + result = zend_hash_index_update(ht, zend_dval_to_lval(Z_DVAL_P(key)), value); break; default: zend_error(E_WARNING, "Illegal offset type"); - result = FAILURE; + result = NULL; } - if (result == SUCCESS) { - Z_ADDREF_P(value); + if (result) { + if (Z_REFCOUNTED_P(result)) { + Z_ADDREF_P(result); + } + return SUCCESS; + } else { + return FAILURE; } - - return result; } /* }}} */ -ZEND_API int add_property_long_ex(zval *arg, const char *key, uint key_len, long n TSRMLS_DC) /* {{{ */ +ZEND_API int add_property_long_ex(zval *arg, const char *key, uint key_len, zend_long n TSRMLS_DC) /* {{{ */ { - zval *tmp; - zval *z_key; + zval tmp; + zval z_key; - MAKE_STD_ZVAL(tmp); - ZVAL_LONG(tmp, n); - - MAKE_STD_ZVAL(z_key); - ZVAL_STRINGL(z_key, key, key_len-1, 1); - - Z_OBJ_HANDLER_P(arg, write_property)(arg, z_key, tmp, 0 TSRMLS_CC); + ZVAL_LONG(&tmp, n); + ZVAL_STRINGL(&z_key, key, key_len); + Z_OBJ_HANDLER_P(arg, write_property)(arg, &z_key, &tmp, NULL TSRMLS_CC); zval_ptr_dtor(&tmp); /* write_property will add 1 to refcount */ zval_ptr_dtor(&z_key); return SUCCESS; } /* }}} */ -ZEND_API int add_property_bool_ex(zval *arg, const char *key, uint key_len, int b TSRMLS_DC) /* {{{ */ +ZEND_API int add_property_bool_ex(zval *arg, const char *key, uint key_len, zend_long b TSRMLS_DC) /* {{{ */ { - zval *tmp; - zval *z_key; - - MAKE_STD_ZVAL(tmp); - ZVAL_BOOL(tmp, b); - - MAKE_STD_ZVAL(z_key); - ZVAL_STRINGL(z_key, key, key_len-1, 1); + zval tmp; + zval z_key; - Z_OBJ_HANDLER_P(arg, write_property)(arg, z_key, tmp, 0 TSRMLS_CC); + ZVAL_BOOL(&tmp, b); + ZVAL_STRINGL(&z_key, key, key_len); + Z_OBJ_HANDLER_P(arg, write_property)(arg, &z_key, &tmp, NULL TSRMLS_CC); zval_ptr_dtor(&tmp); /* write_property will add 1 to refcount */ zval_ptr_dtor(&z_key); return SUCCESS; @@ -1609,34 +1719,26 @@ ZEND_API int add_property_bool_ex(zval *arg, const char *key, uint key_len, int ZEND_API int add_property_null_ex(zval *arg, const char *key, uint key_len TSRMLS_DC) /* {{{ */ { - zval *tmp; - zval *z_key; + zval tmp; + zval z_key; - MAKE_STD_ZVAL(tmp); - ZVAL_NULL(tmp); - - MAKE_STD_ZVAL(z_key); - ZVAL_STRINGL(z_key, key, key_len-1, 1); - - Z_OBJ_HANDLER_P(arg, write_property)(arg, z_key, tmp, 0 TSRMLS_CC); + ZVAL_NULL(&tmp); + ZVAL_STRINGL(&z_key, key, key_len); + Z_OBJ_HANDLER_P(arg, write_property)(arg, &z_key, &tmp, NULL TSRMLS_CC); zval_ptr_dtor(&tmp); /* write_property will add 1 to refcount */ zval_ptr_dtor(&z_key); return SUCCESS; } /* }}} */ -ZEND_API int add_property_resource_ex(zval *arg, const char *key, uint key_len, long n TSRMLS_DC) /* {{{ */ +ZEND_API int add_property_resource_ex(zval *arg, const char *key, uint key_len, zend_resource *r TSRMLS_DC) /* {{{ */ { - zval *tmp; - zval *z_key; - - MAKE_STD_ZVAL(tmp); - ZVAL_RESOURCE(tmp, n); - - MAKE_STD_ZVAL(z_key); - ZVAL_STRINGL(z_key, key, key_len-1, 1); + zval tmp; + zval z_key; - Z_OBJ_HANDLER_P(arg, write_property)(arg, z_key, tmp, 0 TSRMLS_CC); + ZVAL_RES(&tmp, r); + ZVAL_STRINGL(&z_key, key, key_len); + Z_OBJ_HANDLER_P(arg, write_property)(arg, &z_key, &tmp, NULL TSRMLS_CC); zval_ptr_dtor(&tmp); /* write_property will add 1 to refcount */ zval_ptr_dtor(&z_key); return SUCCESS; @@ -1645,52 +1747,54 @@ ZEND_API int add_property_resource_ex(zval *arg, const char *key, uint key_len, ZEND_API int add_property_double_ex(zval *arg, const char *key, uint key_len, double d TSRMLS_DC) /* {{{ */ { - zval *tmp; - zval *z_key; + zval tmp; + zval z_key; - MAKE_STD_ZVAL(tmp); - ZVAL_DOUBLE(tmp, d); - - MAKE_STD_ZVAL(z_key); - ZVAL_STRINGL(z_key, key, key_len-1, 1); - - Z_OBJ_HANDLER_P(arg, write_property)(arg, z_key, tmp, 0 TSRMLS_CC); + ZVAL_DOUBLE(&tmp, d); + ZVAL_STRINGL(&z_key, key, key_len); + Z_OBJ_HANDLER_P(arg, write_property)(arg, &z_key, &tmp, NULL TSRMLS_CC); zval_ptr_dtor(&tmp); /* write_property will add 1 to refcount */ zval_ptr_dtor(&z_key); return SUCCESS; } /* }}} */ -ZEND_API int add_property_string_ex(zval *arg, const char *key, uint key_len, const char *str, int duplicate TSRMLS_DC) /* {{{ */ +ZEND_API int add_property_str_ex(zval *arg, const char *key, uint key_len, zend_string *str TSRMLS_DC) /* {{{ */ { - zval *tmp; - zval *z_key; - - MAKE_STD_ZVAL(tmp); - ZVAL_STRING(tmp, str, duplicate); + zval tmp; + zval z_key; - MAKE_STD_ZVAL(z_key); - ZVAL_STRINGL(z_key, key, key_len-1, 1); - - Z_OBJ_HANDLER_P(arg, write_property)(arg, z_key, tmp, 0 TSRMLS_CC); + ZVAL_STR(&tmp, str); + ZVAL_STRINGL(&z_key, key, key_len); + Z_OBJ_HANDLER_P(arg, write_property)(arg, &z_key, &tmp, NULL TSRMLS_CC); zval_ptr_dtor(&tmp); /* write_property will add 1 to refcount */ zval_ptr_dtor(&z_key); return SUCCESS; } /* }}} */ -ZEND_API int add_property_stringl_ex(zval *arg, const char *key, uint key_len, const char *str, uint length, int duplicate TSRMLS_DC) /* {{{ */ +ZEND_API int add_property_string_ex(zval *arg, const char *key, uint key_len, const char *str TSRMLS_DC) /* {{{ */ { - zval *tmp; - zval *z_key; + zval tmp; + zval z_key; - MAKE_STD_ZVAL(tmp); - ZVAL_STRINGL(tmp, str, length, duplicate); + ZVAL_STRING(&tmp, str); + ZVAL_STRINGL(&z_key, key, key_len); + Z_OBJ_HANDLER_P(arg, write_property)(arg, &z_key, &tmp, NULL TSRMLS_CC); + zval_ptr_dtor(&tmp); /* write_property will add 1 to refcount */ + zval_ptr_dtor(&z_key); + return SUCCESS; +} +/* }}} */ - MAKE_STD_ZVAL(z_key); - ZVAL_STRINGL(z_key, key, key_len-1, 1); +ZEND_API int add_property_stringl_ex(zval *arg, const char *key, uint key_len, const char *str, size_t length TSRMLS_DC) /* {{{ */ +{ + zval tmp; + zval z_key; - Z_OBJ_HANDLER_P(arg, write_property)(arg, z_key, tmp, 0 TSRMLS_CC); + ZVAL_STRINGL(&tmp, str, length); + ZVAL_STRINGL(&z_key, key, key_len); + Z_OBJ_HANDLER_P(arg, write_property)(arg, &z_key, &tmp, NULL TSRMLS_CC); zval_ptr_dtor(&tmp); /* write_property will add 1 to refcount */ zval_ptr_dtor(&z_key); return SUCCESS; @@ -1699,12 +1803,10 @@ ZEND_API int add_property_stringl_ex(zval *arg, const char *key, uint key_len, c ZEND_API int add_property_zval_ex(zval *arg, const char *key, uint key_len, zval *value TSRMLS_DC) /* {{{ */ { - zval *z_key; - - MAKE_STD_ZVAL(z_key); - ZVAL_STRINGL(z_key, key, key_len-1, 1); + zval z_key; - Z_OBJ_HANDLER_P(arg, write_property)(arg, z_key, value, 0 TSRMLS_CC); + ZVAL_STRINGL(&z_key, key, key_len); + Z_OBJ_HANDLER_P(arg, write_property)(arg, &z_key, value, NULL TSRMLS_CC); zval_ptr_dtor(&z_key); return SUCCESS; } @@ -1713,7 +1815,7 @@ ZEND_API int add_property_zval_ex(zval *arg, const char *key, uint key_len, zval ZEND_API int zend_startup_module_ex(zend_module_entry *module TSRMLS_DC) /* {{{ */ { int name_len; - char *lcname; + zend_string *lcname; if (module->module_started) { return SUCCESS; @@ -1729,16 +1831,17 @@ ZEND_API int zend_startup_module_ex(zend_module_entry *module TSRMLS_DC) /* {{{ zend_module_entry *req_mod; name_len = strlen(dep->name); - lcname = zend_str_tolower_dup(dep->name, name_len); + lcname = zend_string_alloc(name_len, 0); + zend_str_tolower_copy(lcname->val, dep->name, name_len); - if (zend_hash_find(&module_registry, lcname, name_len+1, (void**)&req_mod) == FAILURE || !req_mod->module_started) { - efree(lcname); + if ((req_mod = zend_hash_find_ptr(&module_registry, lcname)) == NULL || !req_mod->module_started) { + zend_string_free(lcname); /* TODO: Check version relationship */ zend_error(E_CORE_WARNING, "Cannot load module '%s' because required module '%s' is not loaded", module->name, dep->name); module->module_started = 0; return FAILURE; } - efree(lcname); + zend_string_free(lcname); } ++dep; } @@ -1767,24 +1870,33 @@ ZEND_API int zend_startup_module_ex(zend_module_entry *module TSRMLS_DC) /* {{{ } /* }}} */ +static int zend_startup_module_zval(zval *zv TSRMLS_DC) /* {{{ */ +{ + zend_module_entry *module = Z_PTR_P(zv); + + return zend_startup_module_ex(module TSRMLS_CC); +} +/* }}} */ + + static void zend_sort_modules(void *base, size_t count, size_t siz, compare_func_t compare TSRMLS_DC) /* {{{ */ { - Bucket **b1 = base; - Bucket **b2; - Bucket **end = b1 + count; - Bucket *tmp; + Bucket *b1 = base; + Bucket *b2; + Bucket *end = b1 + count; + Bucket tmp; zend_module_entry *m, *r; while (b1 < end) { try_again: - m = (zend_module_entry*)(*b1)->pData; + m = (zend_module_entry*)Z_PTR(b1->val); if (!m->module_started && m->deps) { const zend_module_dep *dep = m->deps; while (dep->name) { if (dep->type == MODULE_DEP_REQUIRED || dep->type == MODULE_DEP_OPTIONAL) { b2 = b1 + 1; while (b2 < end) { - r = (zend_module_entry*)(*b2)->pData; + r = (zend_module_entry*)Z_PTR(b2->val); if (strcasecmp(dep->name, r->name) == 0) { tmp = *b1; *b1 = *b2; @@ -1804,18 +1916,15 @@ try_again: ZEND_API void zend_collect_module_handlers(TSRMLS_D) /* {{{ */ { - HashPosition pos; zend_module_entry *module; int startup_count = 0; int shutdown_count = 0; int post_deactivate_count = 0; - zend_class_entry **pce; + zend_class_entry *ce; int class_count = 0; /* Collect extensions with request startup/shutdown handlers */ - for (zend_hash_internal_pointer_reset_ex(&module_registry, &pos); - zend_hash_get_current_data_ex(&module_registry, (void *) &module, &pos) == SUCCESS; - zend_hash_move_forward_ex(&module_registry, &pos)) { + ZEND_HASH_FOREACH_PTR(&module_registry, module) { if (module->request_startup_func) { startup_count++; } @@ -1825,7 +1934,7 @@ ZEND_API void zend_collect_module_handlers(TSRMLS_D) /* {{{ */ if (module->post_deactivate_func) { post_deactivate_count++; } - } + } ZEND_HASH_FOREACH_END(); module_request_startup_handlers = (zend_module_entry**)malloc( sizeof(zend_module_entry*) * (startup_count + 1 + @@ -1838,9 +1947,7 @@ ZEND_API void zend_collect_module_handlers(TSRMLS_D) /* {{{ */ module_post_deactivate_handlers[post_deactivate_count] = NULL; startup_count = 0; - for (zend_hash_internal_pointer_reset_ex(&module_registry, &pos); - zend_hash_get_current_data_ex(&module_registry, (void *) &module, &pos) == SUCCESS; - zend_hash_move_forward_ex(&module_registry, &pos)) { + ZEND_HASH_FOREACH_PTR(&module_registry, module) { if (module->request_startup_func) { module_request_startup_handlers[startup_count++] = module; } @@ -1850,17 +1957,15 @@ ZEND_API void zend_collect_module_handlers(TSRMLS_D) /* {{{ */ if (module->post_deactivate_func) { module_post_deactivate_handlers[--post_deactivate_count] = module; } - } + } ZEND_HASH_FOREACH_END(); /* Collect internal classes with static members */ - for (zend_hash_internal_pointer_reset_ex(CG(class_table), &pos); - zend_hash_get_current_data_ex(CG(class_table), (void *) &pce, &pos) == SUCCESS; - zend_hash_move_forward_ex(CG(class_table), &pos)) { - if ((*pce)->type == ZEND_INTERNAL_CLASS && - (*pce)->default_static_members_count > 0) { + ZEND_HASH_FOREACH_PTR(CG(class_table), ce) { + if (ce->type == ZEND_INTERNAL_CLASS && + ce->default_static_members_count > 0) { class_count++; } - } + } ZEND_HASH_FOREACH_END(); class_cleanup_handlers = (zend_class_entry**)malloc( sizeof(zend_class_entry*) * @@ -1868,14 +1973,12 @@ ZEND_API void zend_collect_module_handlers(TSRMLS_D) /* {{{ */ class_cleanup_handlers[class_count] = NULL; if (class_count) { - for (zend_hash_internal_pointer_reset_ex(CG(class_table), &pos); - zend_hash_get_current_data_ex(CG(class_table), (void *) &pce, &pos) == SUCCESS; - zend_hash_move_forward_ex(CG(class_table), &pos)) { - if ((*pce)->type == ZEND_INTERNAL_CLASS && - (*pce)->default_static_members_count > 0) { - class_cleanup_handlers[--class_count] = *pce; + ZEND_HASH_FOREACH_PTR(CG(class_table), ce) { + if (ce->type == ZEND_INTERNAL_CLASS && + ce->default_static_members_count > 0) { + class_cleanup_handlers[--class_count] = ce; } - } + } ZEND_HASH_FOREACH_END(); } } /* }}} */ @@ -1883,7 +1986,7 @@ ZEND_API void zend_collect_module_handlers(TSRMLS_D) /* {{{ */ ZEND_API int zend_startup_modules(TSRMLS_D) /* {{{ */ { zend_hash_sort(&module_registry, zend_sort_modules, NULL, 0 TSRMLS_CC); - zend_hash_apply(&module_registry, (apply_func_t)zend_startup_module_ex TSRMLS_CC); + zend_hash_apply(&module_registry, zend_startup_module_zval TSRMLS_CC); return SUCCESS; } /* }}} */ @@ -1899,7 +2002,7 @@ ZEND_API void zend_destroy_modules(void) /* {{{ */ ZEND_API zend_module_entry* zend_register_module_ex(zend_module_entry *module TSRMLS_DC) /* {{{ */ { int name_len; - char *lcname; + zend_string *lcname; zend_module_entry *module_ptr; if (!module) { @@ -1917,29 +2020,31 @@ ZEND_API zend_module_entry* zend_register_module_ex(zend_module_entry *module TS while (dep->name) { if (dep->type == MODULE_DEP_CONFLICTS) { name_len = strlen(dep->name); - lcname = zend_str_tolower_dup(dep->name, name_len); + lcname = zend_string_alloc(name_len, 0); + zend_str_tolower_copy(lcname->val, dep->name, name_len); - if (zend_hash_exists(&module_registry, lcname, name_len+1)) { - efree(lcname); + if (zend_hash_exists(&module_registry, lcname)) { + zend_string_free(lcname); /* TODO: Check version relationship */ zend_error(E_CORE_WARNING, "Cannot load module '%s' because conflicting module '%s' is already loaded", module->name, dep->name); return NULL; } - efree(lcname); + zend_string_free(lcname); } ++dep; } } name_len = strlen(module->name); - lcname = zend_str_tolower_dup(module->name, name_len); + lcname = zend_string_alloc(name_len, 1); + zend_str_tolower_copy(lcname->val, module->name, name_len); - if (zend_hash_add(&module_registry, lcname, name_len+1, (void *)module, sizeof(zend_module_entry), (void**)&module_ptr)==FAILURE) { + if ((module_ptr = zend_hash_add_mem(&module_registry, lcname, module, sizeof(zend_module_entry))) == NULL) { zend_error(E_CORE_WARNING, "Module '%s' already loaded", module->name); - efree(lcname); + zend_string_release(lcname); return NULL; } - efree(lcname); + zend_string_release(lcname); module = module_ptr; EG(current_module) = module; @@ -1969,56 +2074,59 @@ ZEND_API void zend_check_magic_method_implementation(const zend_class_entry *ce, /* we don't care if the function name is longer, in fact lowercasing only * the beginning of the name speeds up the check process */ - name_len = strlen(fptr->common.function_name); - zend_str_tolower_copy(lcname, fptr->common.function_name, MIN(name_len, sizeof(lcname)-1)); + name_len = fptr->common.function_name->len; + zend_str_tolower_copy(lcname, fptr->common.function_name->val, MIN(name_len, sizeof(lcname)-1)); lcname[sizeof(lcname)-1] = '\0'; /* zend_str_tolower_copy won't necessarily set the zero byte */ - if (name_len == sizeof(ZEND_DESTRUCTOR_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_DESTRUCTOR_FUNC_NAME, sizeof(ZEND_DESTRUCTOR_FUNC_NAME)) && fptr->common.num_args != 0) { - zend_error(error_type, "Destructor %s::%s() cannot take arguments", ce->name, ZEND_DESTRUCTOR_FUNC_NAME); - } else if (name_len == sizeof(ZEND_CLONE_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_CLONE_FUNC_NAME, sizeof(ZEND_CLONE_FUNC_NAME)) && fptr->common.num_args != 0) { - zend_error(error_type, "Method %s::%s() cannot accept any arguments", ce->name, ZEND_CLONE_FUNC_NAME); - } else if (name_len == sizeof(ZEND_GET_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME))) { + if (name_len == sizeof(ZEND_DESTRUCTOR_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_DESTRUCTOR_FUNC_NAME, sizeof(ZEND_DESTRUCTOR_FUNC_NAME) - 1) && fptr->common.num_args != 0) { + zend_error(error_type, "Destructor %s::%s() cannot take arguments", ce->name->val, ZEND_DESTRUCTOR_FUNC_NAME); + } else if (name_len == sizeof(ZEND_CLONE_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_CLONE_FUNC_NAME, sizeof(ZEND_CLONE_FUNC_NAME) - 1) && fptr->common.num_args != 0) { + zend_error(error_type, "Method %s::%s() cannot accept any arguments", ce->name->val, ZEND_CLONE_FUNC_NAME); + } else if (name_len == sizeof(ZEND_GET_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME) - 1)) { if (fptr->common.num_args != 1) { - zend_error(error_type, "Method %s::%s() must take exactly 1 argument", ce->name, ZEND_GET_FUNC_NAME); + zend_error(error_type, "Method %s::%s() must take exactly 1 argument", ce->name->val, ZEND_GET_FUNC_NAME); } else if (ARG_SHOULD_BE_SENT_BY_REF(fptr, 1)) { - zend_error(error_type, "Method %s::%s() cannot take arguments by reference", ce->name, ZEND_GET_FUNC_NAME); + zend_error(error_type, "Method %s::%s() cannot take arguments by reference", ce->name->val, ZEND_GET_FUNC_NAME); } - } else if (name_len == sizeof(ZEND_SET_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME))) { + } else if (name_len == sizeof(ZEND_SET_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME) - 1)) { if (fptr->common.num_args != 2) { - zend_error(error_type, "Method %s::%s() must take exactly 2 arguments", ce->name, ZEND_SET_FUNC_NAME); + zend_error(error_type, "Method %s::%s() must take exactly 2 arguments", ce->name->val, ZEND_SET_FUNC_NAME); } else if (ARG_SHOULD_BE_SENT_BY_REF(fptr, 1) || ARG_SHOULD_BE_SENT_BY_REF(fptr, 2)) { - zend_error(error_type, "Method %s::%s() cannot take arguments by reference", ce->name, ZEND_SET_FUNC_NAME); + zend_error(error_type, "Method %s::%s() cannot take arguments by reference", ce->name->val, ZEND_SET_FUNC_NAME); } - } else if (name_len == sizeof(ZEND_UNSET_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_UNSET_FUNC_NAME, sizeof(ZEND_UNSET_FUNC_NAME))) { + } else if (name_len == sizeof(ZEND_UNSET_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_UNSET_FUNC_NAME, sizeof(ZEND_UNSET_FUNC_NAME) - 1)) { if (fptr->common.num_args != 1) { - zend_error(error_type, "Method %s::%s() must take exactly 1 argument", ce->name, ZEND_UNSET_FUNC_NAME); + zend_error(error_type, "Method %s::%s() must take exactly 1 argument", ce->name->val, ZEND_UNSET_FUNC_NAME); } else if (ARG_SHOULD_BE_SENT_BY_REF(fptr, 1)) { - zend_error(error_type, "Method %s::%s() cannot take arguments by reference", ce->name, ZEND_UNSET_FUNC_NAME); + zend_error(error_type, "Method %s::%s() cannot take arguments by reference", ce->name->val, ZEND_UNSET_FUNC_NAME); } - } else if (name_len == sizeof(ZEND_ISSET_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_ISSET_FUNC_NAME, sizeof(ZEND_ISSET_FUNC_NAME))) { + } else if (name_len == sizeof(ZEND_ISSET_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_ISSET_FUNC_NAME, sizeof(ZEND_ISSET_FUNC_NAME) - 1)) { if (fptr->common.num_args != 1) { - zend_error(error_type, "Method %s::%s() must take exactly 1 argument", ce->name, ZEND_ISSET_FUNC_NAME); + zend_error(error_type, "Method %s::%s() must take exactly 1 argument", ce->name->val, ZEND_ISSET_FUNC_NAME); } else if (ARG_SHOULD_BE_SENT_BY_REF(fptr, 1)) { - zend_error(error_type, "Method %s::%s() cannot take arguments by reference", ce->name, ZEND_ISSET_FUNC_NAME); + zend_error(error_type, "Method %s::%s() cannot take arguments by reference", ce->name->val, ZEND_ISSET_FUNC_NAME); } - } else if (name_len == sizeof(ZEND_CALL_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME))) { + } else if (name_len == sizeof(ZEND_CALL_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME) - 1)) { if (fptr->common.num_args != 2) { - zend_error(error_type, "Method %s::%s() must take exactly 2 arguments", ce->name, ZEND_CALL_FUNC_NAME); + zend_error(error_type, "Method %s::%s() must take exactly 2 arguments", ce->name->val, ZEND_CALL_FUNC_NAME); } else if (ARG_SHOULD_BE_SENT_BY_REF(fptr, 1) || ARG_SHOULD_BE_SENT_BY_REF(fptr, 2)) { - zend_error(error_type, "Method %s::%s() cannot take arguments by reference", ce->name, ZEND_CALL_FUNC_NAME); + zend_error(error_type, "Method %s::%s() cannot take arguments by reference", ce->name->val, ZEND_CALL_FUNC_NAME); } } else if (name_len == sizeof(ZEND_CALLSTATIC_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_CALLSTATIC_FUNC_NAME, sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1) ) { if (fptr->common.num_args != 2) { - zend_error(error_type, "Method %s::%s() must take exactly 2 arguments", ce->name, ZEND_CALLSTATIC_FUNC_NAME); + zend_error(error_type, "Method %s::%s() must take exactly 2 arguments", ce->name->val, ZEND_CALLSTATIC_FUNC_NAME); } else if (ARG_SHOULD_BE_SENT_BY_REF(fptr, 1) || ARG_SHOULD_BE_SENT_BY_REF(fptr, 2)) { - zend_error(error_type, "Method %s::%s() cannot take arguments by reference", ce->name, ZEND_CALLSTATIC_FUNC_NAME); + zend_error(error_type, "Method %s::%s() cannot take arguments by reference", ce->name->val, ZEND_CALLSTATIC_FUNC_NAME); } } else if (name_len == sizeof(ZEND_TOSTRING_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_TOSTRING_FUNC_NAME, sizeof(ZEND_TOSTRING_FUNC_NAME)-1) && fptr->common.num_args != 0 ) { - zend_error(error_type, "Method %s::%s() cannot take arguments", ce->name, ZEND_TOSTRING_FUNC_NAME); + zend_error(error_type, "Method %s::%s() cannot take arguments", ce->name->val, ZEND_TOSTRING_FUNC_NAME); + } else if (name_len == sizeof(ZEND_DEBUGINFO_FUNC_NAME) - 1 && + !memcmp(lcname, ZEND_DEBUGINFO_FUNC_NAME, sizeof(ZEND_DEBUGINFO_FUNC_NAME)-1) && fptr->common.num_args != 0) { + zend_error(error_type, "Method %s::%s() cannot take arguments", ce->name->val, ZEND_DEBUGINFO_FUNC_NAME); } } /* }}} */ @@ -2032,12 +2140,11 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio int count=0, unload=0; HashTable *target_function_table = function_table; int error_type; - zend_function *ctor = NULL, *dtor = NULL, *clone = NULL, *__get = NULL, *__set = NULL, *__unset = NULL, *__isset = NULL, *__call = NULL, *__callstatic = NULL, *__tostring = NULL; - const char *lowercase_name; + zend_function *ctor = NULL, *dtor = NULL, *clone = NULL, *__get = NULL, *__set = NULL, *__unset = NULL, *__isset = NULL, *__call = NULL, *__callstatic = NULL, *__tostring = NULL, *__debugInfo = NULL; + zend_string *lowercase_name; int fname_len; const char *lc_class_name = NULL; int class_name_len = 0; - zend_ulong hash; if (type==MODULE_PERSISTENT) { error_type = E_CORE_WARNING; @@ -2052,25 +2159,26 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio internal_function->module = EG(current_module); if (scope) { - class_name_len = strlen(scope->name); - if ((lc_class_name = zend_memrchr(scope->name, '\\', class_name_len))) { + class_name_len = scope->name->len; + if ((lc_class_name = zend_memrchr(scope->name->val, '\\', class_name_len))) { ++lc_class_name; - class_name_len -= (lc_class_name - scope->name); + class_name_len -= (lc_class_name - scope->name->val); lc_class_name = zend_str_tolower_dup(lc_class_name, class_name_len); } else { - lc_class_name = zend_str_tolower_dup(scope->name, class_name_len); + lc_class_name = zend_str_tolower_dup(scope->name->val, class_name_len); } } while (ptr->fname) { + fname_len = strlen(ptr->fname); internal_function->handler = ptr->handler; - internal_function->function_name = (char*)ptr->fname; + internal_function->function_name = zend_new_interned_string(zend_string_init(ptr->fname, fname_len, 1) TSRMLS_CC); internal_function->scope = scope; internal_function->prototype = NULL; if (ptr->flags) { if (!(ptr->flags & ZEND_ACC_PPP_MASK)) { if (ptr->flags != ZEND_ACC_DEPRECATED || scope) { - zend_error(error_type, "Invalid access level for %s%s%s() - access must be exactly one of public, protected or private", scope ? scope->name : "", scope ? "::" : "", ptr->fname); + zend_error(error_type, "Invalid access level for %s%s%s() - access must be exactly one of public, protected or private", scope ? scope->name->val : "", scope ? "::" : "", ptr->fname); } internal_function->fn_flags = ZEND_ACC_PUBLIC | ptr->flags; } else { @@ -2113,61 +2221,79 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio } } if (ptr->flags & ZEND_ACC_STATIC && (!scope || !(scope->ce_flags & ZEND_ACC_INTERFACE))) { - zend_error(error_type, "Static function %s%s%s() cannot be abstract", scope ? scope->name : "", scope ? "::" : "", ptr->fname); + zend_error(error_type, "Static function %s%s%s() cannot be abstract", scope ? scope->name->val : "", scope ? "::" : "", ptr->fname); } } else { if (scope && (scope->ce_flags & ZEND_ACC_INTERFACE)) { efree((char*)lc_class_name); - zend_error(error_type, "Interface %s cannot contain non abstract method %s()", scope->name, ptr->fname); + zend_error(error_type, "Interface %s cannot contain non abstract method %s()", scope->name->val, ptr->fname); return FAILURE; } if (!internal_function->handler) { if (scope) { efree((char*)lc_class_name); } - zend_error(error_type, "Method %s%s%s() cannot be a NULL function", scope ? scope->name : "", scope ? "::" : "", ptr->fname); + zend_error(error_type, "Method %s%s%s() cannot be a NULL function", scope ? scope->name->val : "", scope ? "::" : "", ptr->fname); zend_unregister_functions(functions, count, target_function_table TSRMLS_CC); return FAILURE; } } - fname_len = strlen(ptr->fname); - lowercase_name = zend_new_interned_string(zend_str_tolower_dup(ptr->fname, fname_len), fname_len + 1, 1 TSRMLS_CC); - hash = str_hash(lowercase_name, fname_len); - if (zend_hash_quick_add(target_function_table, lowercase_name, fname_len+1, hash, &function, sizeof(zend_function), (void**)®_function) == FAILURE) { + lowercase_name = zend_string_alloc(fname_len, 1); + zend_str_tolower_copy(lowercase_name->val, ptr->fname, fname_len); + lowercase_name = zend_new_interned_string(lowercase_name TSRMLS_CC); + reg_function = malloc(sizeof(zend_internal_function)); + memcpy(reg_function, &function, sizeof(zend_internal_function)); + if (zend_hash_add_ptr(target_function_table, lowercase_name, reg_function) == NULL) { unload=1; - str_efree(lowercase_name); + free(reg_function); + zend_string_release(lowercase_name); break; } + + /* If types of arguments have to be checked */ + if (reg_function->common.arg_info && reg_function->common.num_args) { + uint32_t i; + for (i = 0; i < reg_function->common.num_args; i++) { + if (reg_function->common.arg_info[i].class_name || + reg_function->common.arg_info[i].type_hint) { + reg_function->common.fn_flags |= ZEND_ACC_HAS_TYPE_HINTS; + break; + } + } + } + if (scope) { /* Look for ctor, dtor, clone * If it's an old-style constructor, store it only if we don't have * a constructor already. */ - if ((fname_len == class_name_len) && !ctor && !memcmp(lowercase_name, lc_class_name, class_name_len+1)) { + if ((fname_len == class_name_len) && !ctor && !memcmp(lowercase_name->val, lc_class_name, class_name_len+1)) { ctor = reg_function; - } else if ((fname_len == sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) && !memcmp(lowercase_name, ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME))) { + } else if (zend_string_equals_literal(lowercase_name, ZEND_CONSTRUCTOR_FUNC_NAME)) { ctor = reg_function; - } else if ((fname_len == sizeof(ZEND_DESTRUCTOR_FUNC_NAME)-1) && !memcmp(lowercase_name, ZEND_DESTRUCTOR_FUNC_NAME, sizeof(ZEND_DESTRUCTOR_FUNC_NAME))) { + } else if (zend_string_equals_literal(lowercase_name, ZEND_DESTRUCTOR_FUNC_NAME)) { dtor = reg_function; if (internal_function->num_args) { - zend_error(error_type, "Destructor %s::%s() cannot take arguments", scope->name, ptr->fname); + zend_error(error_type, "Destructor %s::%s() cannot take arguments", scope->name->val, ptr->fname); } - } else if ((fname_len == sizeof(ZEND_CLONE_FUNC_NAME)-1) && !memcmp(lowercase_name, ZEND_CLONE_FUNC_NAME, sizeof(ZEND_CLONE_FUNC_NAME))) { + } else if (zend_string_equals_literal(lowercase_name, ZEND_CLONE_FUNC_NAME)) { clone = reg_function; - } else if ((fname_len == sizeof(ZEND_CALL_FUNC_NAME)-1) && !memcmp(lowercase_name, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME))) { + } else if (zend_string_equals_literal(lowercase_name, ZEND_CALL_FUNC_NAME)) { __call = reg_function; - } else if ((fname_len == sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1) && !memcmp(lowercase_name, ZEND_CALLSTATIC_FUNC_NAME, sizeof(ZEND_CALLSTATIC_FUNC_NAME))) { + } else if (zend_string_equals_literal(lowercase_name, ZEND_CALLSTATIC_FUNC_NAME)) { __callstatic = reg_function; - } else if ((fname_len == sizeof(ZEND_TOSTRING_FUNC_NAME)-1) && !memcmp(lowercase_name, ZEND_TOSTRING_FUNC_NAME, sizeof(ZEND_TOSTRING_FUNC_NAME))) { + } else if (zend_string_equals_literal(lowercase_name, ZEND_TOSTRING_FUNC_NAME)) { __tostring = reg_function; - } else if ((fname_len == sizeof(ZEND_GET_FUNC_NAME)-1) && !memcmp(lowercase_name, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME))) { + } else if (zend_string_equals_literal(lowercase_name, ZEND_GET_FUNC_NAME)) { __get = reg_function; - } else if ((fname_len == sizeof(ZEND_SET_FUNC_NAME)-1) && !memcmp(lowercase_name, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME))) { + } else if (zend_string_equals_literal(lowercase_name, ZEND_SET_FUNC_NAME)) { __set = reg_function; - } else if ((fname_len == sizeof(ZEND_UNSET_FUNC_NAME)-1) && !memcmp(lowercase_name, ZEND_UNSET_FUNC_NAME, sizeof(ZEND_UNSET_FUNC_NAME))) { + } else if (zend_string_equals_literal(lowercase_name, ZEND_UNSET_FUNC_NAME)) { __unset = reg_function; - } else if ((fname_len == sizeof(ZEND_ISSET_FUNC_NAME)-1) && !memcmp(lowercase_name, ZEND_ISSET_FUNC_NAME, sizeof(ZEND_ISSET_FUNC_NAME))) { + } else if (zend_string_equals_literal(lowercase_name, ZEND_ISSET_FUNC_NAME)) { __isset = reg_function; + } else if (zend_string_equals_literal(lowercase_name, ZEND_DEBUGINFO_FUNC_NAME)) { + __debugInfo = reg_function; } else { reg_function = NULL; } @@ -2177,7 +2303,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio } ptr++; count++; - str_efree(lowercase_name); + zend_string_release(lowercase_name); } if (unload) { /* before unloading, display all remaining bad function in the module */ if (scope) { @@ -2185,11 +2311,12 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio } while (ptr->fname) { fname_len = strlen(ptr->fname); - lowercase_name = zend_str_tolower_dup(ptr->fname, fname_len); - if (zend_hash_exists(target_function_table, lowercase_name, fname_len+1)) { - zend_error(error_type, "Function registration failed - duplicate name - %s%s%s", scope ? scope->name : "", scope ? "::" : "", ptr->fname); + lowercase_name = zend_string_alloc(fname_len, 0); + zend_str_tolower_copy(lowercase_name->val, ptr->fname, fname_len); + if (zend_hash_exists(target_function_table, lowercase_name)) { + zend_error(error_type, "Function registration failed - duplicate name - %s%s%s", scope ? scope->name->val : "", scope ? "::" : "", ptr->fname); } - efree((char*)lowercase_name); + zend_string_free(lowercase_name); ptr++; } zend_unregister_functions(functions, count, target_function_table TSRMLS_CC); @@ -2206,69 +2333,75 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio scope->__set = __set; scope->__unset = __unset; scope->__isset = __isset; + scope->__debugInfo = __debugInfo; if (ctor) { ctor->common.fn_flags |= ZEND_ACC_CTOR; if (ctor->common.fn_flags & ZEND_ACC_STATIC) { - zend_error(error_type, "Constructor %s::%s() cannot be static", scope->name, ctor->common.function_name); + zend_error(error_type, "Constructor %s::%s() cannot be static", scope->name->val, ctor->common.function_name->val); } ctor->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC; } if (dtor) { dtor->common.fn_flags |= ZEND_ACC_DTOR; if (dtor->common.fn_flags & ZEND_ACC_STATIC) { - zend_error(error_type, "Destructor %s::%s() cannot be static", scope->name, dtor->common.function_name); + zend_error(error_type, "Destructor %s::%s() cannot be static", scope->name->val, dtor->common.function_name->val); } dtor->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC; } if (clone) { clone->common.fn_flags |= ZEND_ACC_CLONE; if (clone->common.fn_flags & ZEND_ACC_STATIC) { - zend_error(error_type, "Constructor %s::%s() cannot be static", scope->name, clone->common.function_name); + zend_error(error_type, "Constructor %s::%s() cannot be static", scope->name->val, clone->common.function_name->val); } clone->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC; } if (__call) { if (__call->common.fn_flags & ZEND_ACC_STATIC) { - zend_error(error_type, "Method %s::%s() cannot be static", scope->name, __call->common.function_name); + zend_error(error_type, "Method %s::%s() cannot be static", scope->name->val, __call->common.function_name->val); } __call->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC; } if (__callstatic) { if (!(__callstatic->common.fn_flags & ZEND_ACC_STATIC)) { - zend_error(error_type, "Method %s::%s() must be static", scope->name, __callstatic->common.function_name); + zend_error(error_type, "Method %s::%s() must be static", scope->name->val, __callstatic->common.function_name->val); } __callstatic->common.fn_flags |= ZEND_ACC_STATIC; } if (__tostring) { if (__tostring->common.fn_flags & ZEND_ACC_STATIC) { - zend_error(error_type, "Method %s::%s() cannot be static", scope->name, __tostring->common.function_name); + zend_error(error_type, "Method %s::%s() cannot be static", scope->name->val, __tostring->common.function_name->val); } __tostring->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC; } if (__get) { if (__get->common.fn_flags & ZEND_ACC_STATIC) { - zend_error(error_type, "Method %s::%s() cannot be static", scope->name, __get->common.function_name); + zend_error(error_type, "Method %s::%s() cannot be static", scope->name->val, __get->common.function_name->val); } __get->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC; } if (__set) { if (__set->common.fn_flags & ZEND_ACC_STATIC) { - zend_error(error_type, "Method %s::%s() cannot be static", scope->name, __set->common.function_name); + zend_error(error_type, "Method %s::%s() cannot be static", scope->name->val, __set->common.function_name->val); } __set->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC; } if (__unset) { if (__unset->common.fn_flags & ZEND_ACC_STATIC) { - zend_error(error_type, "Method %s::%s() cannot be static", scope->name, __unset->common.function_name); + zend_error(error_type, "Method %s::%s() cannot be static", scope->name->val, __unset->common.function_name->val); } __unset->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC; } if (__isset) { if (__isset->common.fn_flags & ZEND_ACC_STATIC) { - zend_error(error_type, "Method %s::%s() cannot be static", scope->name, __isset->common.function_name); + zend_error(error_type, "Method %s::%s() cannot be static", scope->name->val, __isset->common.function_name->val); } __isset->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC; } + if (__debugInfo) { + if (__debugInfo->common.fn_flags & ZEND_ACC_STATIC) { + zend_error(error_type, "Method %s::%s() cannot be static", scope->name->val, __debugInfo->common.function_name->val); + } + } efree((char*)lc_class_name); } return SUCCESS; @@ -2283,6 +2416,8 @@ ZEND_API void zend_unregister_functions(const zend_function_entry *functions, in const zend_function_entry *ptr = functions; int i=0; HashTable *target_function_table = function_table; + zend_string *lowercase_name; + int fname_len; if (!target_function_table) { target_function_table = CG(function_table); @@ -2291,20 +2426,19 @@ ZEND_API void zend_unregister_functions(const zend_function_entry *functions, in if (count!=-1 && i>=count) { break; } -#if 0 - zend_printf("Unregistering %s()\n", ptr->fname); -#endif - zend_hash_del(target_function_table, ptr->fname, strlen(ptr->fname)+1); + fname_len = strlen(ptr->fname); + lowercase_name = zend_string_alloc(fname_len, 0); + zend_str_tolower_copy(lowercase_name->val, ptr->fname, fname_len); + zend_hash_del(target_function_table, lowercase_name); + zend_string_free(lowercase_name); ptr++; i++; } } /* }}} */ -ZEND_API int zend_startup_module(zend_module_entry *module) /* {{{ */ +ZEND_API int zend_startup_module(zend_module_entry *module TSRMLS_DC) /* {{{ */ { - TSRMLS_FETCH(); - if ((module = zend_register_internal_module(module TSRMLS_CC)) != NULL && zend_startup_module_ex(module TSRMLS_CC) == SUCCESS) { return SUCCESS; } @@ -2316,13 +2450,16 @@ ZEND_API int zend_get_module_started(const char *module_name) /* {{{ */ { zend_module_entry *module; - return (zend_hash_find(&module_registry, module_name, strlen(module_name)+1, (void**)&module) == SUCCESS && module->module_started) ? SUCCESS : FAILURE; + module = zend_hash_str_find_ptr(&module_registry, module_name, strlen(module_name)); + return (module && module->module_started) ? SUCCESS : FAILURE; } /* }}} */ -static int clean_module_class(const zend_class_entry **ce, int *module_number TSRMLS_DC) /* {{{ */ +static int clean_module_class(zval *el, void *arg TSRMLS_DC) /* {{{ */ { - if ((*ce)->type == ZEND_INTERNAL_CLASS && (*ce)->info.internal.module->module_number == *module_number) { + zend_class_entry *ce = (zend_class_entry *)Z_PTR_P(el); + int module_number = *(int *)arg; + if (ce->type == ZEND_INTERNAL_CLASS && ce->info.internal.module->module_number == module_number) { return ZEND_HASH_APPLY_REMOVE; } else { return ZEND_HASH_APPLY_KEEP; @@ -2332,7 +2469,7 @@ static int clean_module_class(const zend_class_entry **ce, int *module_number TS static void clean_module_classes(int module_number TSRMLS_DC) /* {{{ */ { - zend_hash_apply_with_argument(EG(class_table), (apply_func_arg_t) clean_module_class, (void *) &module_number TSRMLS_CC); + zend_hash_apply_with_argument(EG(class_table), clean_module_class, (void *) &module_number TSRMLS_CC); } /* }}} */ @@ -2381,7 +2518,7 @@ void module_destructor(zend_module_entry *module) /* {{{ */ } /* }}} */ -void zend_activate_modules(TSRMLS_D) /* {{{ */ +ZEND_API void zend_activate_modules(TSRMLS_D) /* {{{ */ { zend_module_entry **p = module_request_startup_handlers; @@ -2398,8 +2535,10 @@ void zend_activate_modules(TSRMLS_D) /* {{{ */ /* }}} */ /* call request shutdown for all modules */ -int module_registry_cleanup(zend_module_entry *module TSRMLS_DC) /* {{{ */ +static int module_registry_cleanup(zval *zv TSRMLS_DC) /* {{{ */ { + zend_module_entry *module = Z_PTR_P(zv); + if (module->request_shutdown_func) { #if 0 zend_printf("%s: Request shutdown\n", module->name); @@ -2410,13 +2549,13 @@ int module_registry_cleanup(zend_module_entry *module TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_deactivate_modules(TSRMLS_D) /* {{{ */ +ZEND_API void zend_deactivate_modules(TSRMLS_D) /* {{{ */ { - EG(opline_ptr) = NULL; /* we're no longer executing anything */ + EG(current_execute_data) = NULL; /* we're no longer executing anything */ zend_try { if (EG(full_tables_cleanup)) { - zend_hash_reverse_apply(&module_registry, (apply_func_t) module_registry_cleanup TSRMLS_CC); + zend_hash_reverse_apply(&module_registry, module_registry_cleanup TSRMLS_CC); } else { zend_module_entry **p = module_request_shutdown_handlers; @@ -2448,8 +2587,16 @@ int module_registry_unload_temp(const zend_module_entry *module TSRMLS_DC) /* {{ } /* }}} */ -static int exec_done_cb(zend_module_entry *module TSRMLS_DC) /* {{{ */ +static int module_registry_unload_temp_wrapper(zval *el TSRMLS_DC) /* {{{ */ { + zend_module_entry *module = (zend_module_entry *)Z_PTR_P(el); + return module_registry_unload_temp((const zend_module_entry *)module TSRMLS_CC); +} +/* }}} */ + +static int exec_done_cb(zval *el TSRMLS_DC) /* {{{ */ +{ + zend_module_entry *module = (zend_module_entry *)Z_PTR_P(el); if (module->post_deactivate_func) { module->post_deactivate_func(); } @@ -2457,11 +2604,11 @@ static int exec_done_cb(zend_module_entry *module TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_post_deactivate_modules(TSRMLS_D) /* {{{ */ +ZEND_API void zend_post_deactivate_modules(TSRMLS_D) /* {{{ */ { if (EG(full_tables_cleanup)) { - zend_hash_apply(&module_registry, (apply_func_t) exec_done_cb TSRMLS_CC); - zend_hash_reverse_apply(&module_registry, (apply_func_t) module_registry_unload_temp TSRMLS_CC); + zend_hash_apply(&module_registry, exec_done_cb TSRMLS_CC); + zend_hash_reverse_apply(&module_registry, module_registry_unload_temp_wrapper TSRMLS_CC); } else { zend_module_entry **p = module_post_deactivate_handlers; @@ -2476,33 +2623,31 @@ void zend_post_deactivate_modules(TSRMLS_D) /* {{{ */ /* }}} */ /* return the next free module number */ -int zend_next_free_module(void) /* {{{ */ +ZEND_API int zend_next_free_module(void) /* {{{ */ { return zend_hash_num_elements(&module_registry) + 1; } /* }}} */ -static zend_class_entry *do_register_internal_class(zend_class_entry *orig_class_entry, zend_uint ce_flags TSRMLS_DC) /* {{{ */ +static zend_class_entry *do_register_internal_class(zend_class_entry *orig_class_entry, uint32_t ce_flags TSRMLS_DC) /* {{{ */ { zend_class_entry *class_entry = malloc(sizeof(zend_class_entry)); - char *lowercase_name = emalloc(orig_class_entry->name_length + 1); - zend_ulong hash; + zend_string *lowercase_name = zend_string_alloc(orig_class_entry->name->len, 1); *class_entry = *orig_class_entry; class_entry->type = ZEND_INTERNAL_CLASS; zend_initialize_class_data(class_entry, 0 TSRMLS_CC); - class_entry->ce_flags = ce_flags; + class_entry->ce_flags = ce_flags | ZEND_ACC_CONSTANTS_UPDATED; class_entry->info.internal.module = EG(current_module); if (class_entry->info.internal.builtin_functions) { zend_register_functions(class_entry, class_entry->info.internal.builtin_functions, &class_entry->function_table, MODULE_PERSISTENT TSRMLS_CC); } - zend_str_tolower_copy(lowercase_name, orig_class_entry->name, class_entry->name_length); - lowercase_name = (char*)zend_new_interned_string(lowercase_name, class_entry->name_length + 1, 1 TSRMLS_CC); - hash = str_hash(lowercase_name, class_entry->name_length); - zend_hash_quick_update(CG(class_table), lowercase_name, class_entry->name_length+1, hash, &class_entry, sizeof(zend_class_entry *), NULL); - str_efree(lowercase_name); + zend_str_tolower_copy(lowercase_name->val, orig_class_entry->name->val, class_entry->name->len); + lowercase_name = zend_new_interned_string(lowercase_name TSRMLS_CC); + zend_hash_update_ptr(CG(class_table), lowercase_name, class_entry); + zend_string_release(lowercase_name); return class_entry; } /* }}} */ @@ -2512,19 +2657,10 @@ static zend_class_entry *do_register_internal_class(zend_class_entry *orig_class * If both parent_ce and parent_name are NULL it does a regular class registration * If parent_name is specified but not found NULL is returned */ -ZEND_API zend_class_entry *zend_register_internal_class_ex(zend_class_entry *class_entry, zend_class_entry *parent_ce, char *parent_name TSRMLS_DC) /* {{{ */ +ZEND_API zend_class_entry *zend_register_internal_class_ex(zend_class_entry *class_entry, zend_class_entry *parent_ce TSRMLS_DC) /* {{{ */ { zend_class_entry *register_class; - if (!parent_ce && parent_name) { - zend_class_entry **pce; - if (zend_hash_find(CG(class_table), parent_name, strlen(parent_name)+1, (void **) &pce)==FAILURE) { - return NULL; - } else { - parent_ce = *pce; - } - } - register_class = zend_register_internal_class(class_entry TSRMLS_CC); if (parent_ce) { @@ -2565,20 +2701,22 @@ ZEND_API zend_class_entry *zend_register_internal_interface(zend_class_entry *or ZEND_API int zend_register_class_alias_ex(const char *name, int name_len, zend_class_entry *ce TSRMLS_DC) /* {{{ */ { - char *lcname = zend_str_tolower_dup(name, name_len); - int ret; + zend_string *lcname; - if (lcname[0] == '\\') { - ret = zend_hash_add(CG(class_table), lcname+1, name_len, &ce, sizeof(zend_class_entry *), NULL); + if (name[0] == '\\') { + lcname = zend_string_alloc(name_len-1, 1); + zend_str_tolower_copy(lcname->val, name+1, name_len-1); } else { - ret = zend_hash_add(CG(class_table), lcname, name_len+1, &ce, sizeof(zend_class_entry *), NULL); + lcname = zend_string_alloc(name_len, 1); + zend_str_tolower_copy(lcname->val, name, name_len); } - - efree(lcname); - if (ret == SUCCESS) { + ce = zend_hash_add_ptr(CG(class_table), lcname, ce); + zend_string_release(lcname); + if (ce) { ce->refcount++; + return SUCCESS; } - return ret; + return FAILURE; } /* }}} */ @@ -2589,13 +2727,17 @@ ZEND_API int zend_set_hash_symbol(zval *symbol, const char *name, int name_lengt if (num_symbol_tables <= 0) return FAILURE; - Z_SET_ISREF_TO_P(symbol, is_ref); + if (is_ref) { + ZVAL_MAKE_REF(symbol); + } va_start(symbol_table_list, num_symbol_tables); while (num_symbol_tables-- > 0) { symbol_table = va_arg(symbol_table_list, HashTable *); - zend_hash_update(symbol_table, name, name_length + 1, &symbol, sizeof(zval *), NULL); - zval_add_ref(&symbol); + zend_hash_str_update(symbol_table, name, name_length, symbol); + if (Z_REFCOUNTED_P(symbol)) { + Z_ADDREF_P(symbol); + } } va_end(symbol_table_list); return SUCCESS; @@ -2619,7 +2761,10 @@ static zend_function_entry disabled_function[] = { ZEND_API int zend_disable_function(char *function_name, uint function_name_length TSRMLS_DC) /* {{{ */ { - if (zend_hash_del(CG(function_table), function_name, function_name_length+1)==FAILURE) { + int ret; + + ret = zend_hash_str_del(CG(function_table), function_name, function_name_length); + if (ret == FAILURE) { return FAILURE; } disabled_function[0].fname = function_name; @@ -2630,13 +2775,13 @@ ZEND_API int zend_disable_function(char *function_name, uint function_name_lengt #ifdef ZEND_WIN32 #pragma optimize("", off) #endif -static zend_object_value display_disabled_class(zend_class_entry *class_type TSRMLS_DC) /* {{{ */ +static zend_object *display_disabled_class(zend_class_entry *class_type TSRMLS_DC) /* {{{ */ { - zend_object_value retval; zend_object *intern; - retval = zend_objects_new(&intern, class_type TSRMLS_CC); - zend_error(E_WARNING, "%s() has been disabled for security reasons", class_type->name); - return retval; + + intern = zend_objects_new(class_type TSRMLS_CC); + zend_error(E_WARNING, "%s() has been disabled for security reasons", class_type->name->val); + return intern; } #ifdef ZEND_WIN32 #pragma optimize("", on) @@ -2649,84 +2794,94 @@ static const zend_function_entry disabled_class_new[] = { ZEND_API int zend_disable_class(char *class_name, uint class_name_length TSRMLS_DC) /* {{{ */ { - zend_class_entry **disabled_class; + zend_class_entry *disabled_class; + zend_string *key; - zend_str_tolower(class_name, class_name_length); - if (zend_hash_find(CG(class_table), class_name, class_name_length+1, (void **)&disabled_class)==FAILURE) { + key = zend_string_alloc(class_name_length, 0); + zend_str_tolower_copy(key->val, class_name, class_name_length); + disabled_class = zend_hash_find_ptr(CG(class_table), key); + if (!disabled_class) { return FAILURE; } - INIT_CLASS_ENTRY_INIT_METHODS((**disabled_class), disabled_class_new, NULL, NULL, NULL, NULL, NULL); - (*disabled_class)->create_object = display_disabled_class; - zend_hash_clean(&((*disabled_class)->function_table)); + INIT_CLASS_ENTRY_INIT_METHODS((*disabled_class), disabled_class_new, NULL, NULL, NULL, NULL, NULL); + disabled_class->create_object = display_disabled_class; + zend_hash_clean(&disabled_class->function_table); return SUCCESS; } /* }}} */ -static int zend_is_callable_check_class(const char *name, int name_len, zend_fcall_info_cache *fcc, int *strict_class, char **error TSRMLS_DC) /* {{{ */ +static int zend_is_callable_check_class(zend_string *name, zend_fcall_info_cache *fcc, int *strict_class, char **error TSRMLS_DC) /* {{{ */ { int ret = 0; - zend_class_entry **pce; - char *lcname = zend_str_tolower_dup(name, name_len); + zend_class_entry *ce; + int name_len = name->len; + zend_string *lcname; + ALLOCA_FLAG(use_heap); + + STR_ALLOCA_ALLOC(lcname, name_len, use_heap); + zend_str_tolower_copy(lcname->val, name->val, name_len); *strict_class = 0; - if (name_len == sizeof("self") - 1 && - !memcmp(lcname, "self", sizeof("self") - 1)) { + if (zend_string_equals_literal(lcname, "self")) { if (!EG(scope)) { if (error) *error = estrdup("cannot access self:: when no class scope is active"); } else { - fcc->called_scope = EG(called_scope); + fcc->called_scope = EG(current_execute_data) ? EG(current_execute_data)->called_scope : NULL; fcc->calling_scope = EG(scope); - if (!fcc->object_ptr) { - fcc->object_ptr = EG(This); + if (!fcc->object && EG(current_execute_data) && Z_OBJ(EG(current_execute_data)->This)) { + fcc->object = Z_OBJ(EG(current_execute_data)->This); } ret = 1; } - } else if (name_len == sizeof("parent") - 1 && - !memcmp(lcname, "parent", sizeof("parent") - 1)) { + } else if (zend_string_equals_literal(lcname, "parent")) { if (!EG(scope)) { if (error) *error = estrdup("cannot access parent:: when no class scope is active"); } else if (!EG(scope)->parent) { if (error) *error = estrdup("cannot access parent:: when current class scope has no parent"); } else { - fcc->called_scope = EG(called_scope); + fcc->called_scope = EG(current_execute_data) ? EG(current_execute_data)->called_scope : NULL; fcc->calling_scope = EG(scope)->parent; - if (!fcc->object_ptr) { - fcc->object_ptr = EG(This); + if (!fcc->object && EG(current_execute_data) && Z_OBJ(EG(current_execute_data)->This)) { + fcc->object = Z_OBJ(EG(current_execute_data)->This); } *strict_class = 1; ret = 1; } - } else if (name_len == sizeof("static") - 1 && - !memcmp(lcname, "static", sizeof("static") - 1)) { - if (!EG(called_scope)) { + } else if (zend_string_equals_literal(lcname, "static")) { + if (!EG(current_execute_data) || !EG(current_execute_data)->called_scope) { if (error) *error = estrdup("cannot access static:: when no class scope is active"); } else { - fcc->called_scope = EG(called_scope); - fcc->calling_scope = EG(called_scope); - if (!fcc->object_ptr) { - fcc->object_ptr = EG(This); + fcc->called_scope = EG(current_execute_data)->called_scope; + fcc->calling_scope = EG(current_execute_data)->called_scope; + if (!fcc->object && Z_OBJ(EG(current_execute_data)->This)) { + fcc->object = Z_OBJ(EG(current_execute_data)->This); } *strict_class = 1; ret = 1; } - } else if (zend_lookup_class_ex(name, name_len, NULL, 1, &pce TSRMLS_CC) == SUCCESS) { - zend_class_entry *scope = EG(active_op_array) ? EG(active_op_array)->scope : NULL; + } else if ((ce = zend_lookup_class_ex(name, NULL, 1 TSRMLS_CC)) != NULL) { + zend_class_entry *scope; + zend_execute_data *ex = EG(current_execute_data); - fcc->calling_scope = *pce; - if (scope && !fcc->object_ptr && EG(This) && - instanceof_function(Z_OBJCE_P(EG(This)), scope TSRMLS_CC) && + while (ex && (!ex->func || !ZEND_USER_CODE(ex->func->type))) { + ex = ex->prev_execute_data; + } + scope = ex ? ex->func->common.scope : NULL; + fcc->calling_scope = ce; + if (scope && !fcc->object && EG(current_execute_data) && Z_OBJ(EG(current_execute_data)->This) && + instanceof_function(Z_OBJCE(EG(current_execute_data)->This), scope TSRMLS_CC) && instanceof_function(scope, fcc->calling_scope TSRMLS_CC)) { - fcc->object_ptr = EG(This); - fcc->called_scope = Z_OBJCE_P(fcc->object_ptr); + fcc->object = Z_OBJ(EG(current_execute_data)->This); + fcc->called_scope = Z_OBJCE(EG(current_execute_data)->This); } else { - fcc->called_scope = fcc->object_ptr ? Z_OBJCE_P(fcc->object_ptr) : fcc->calling_scope; + fcc->called_scope = fcc->object ? fcc->object->ce : fcc->calling_scope; } *strict_class = 1; ret = 1; } else { - if (error) zend_spprintf(error, 0, "class '%.*s' not found", name_len, name); + if (error) zend_spprintf(error, 0, "class '%.*s' not found", name_len, name->val); } - efree(lcname); + STR_ALLOCA_FREE(lcname, use_heap); return ret; } /* }}} */ @@ -2735,12 +2890,14 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca { zend_class_entry *ce_org = fcc->calling_scope; int retval = 0; - char *mname, *lmname; + zend_string *mname, *cname; + zend_string *lmname; const char *colon; int clen, mlen; zend_class_entry *last_scope; HashTable *ftable; int call_via_handler = 0; + ALLOCA_FLAG(use_heap) if (error) { *error = NULL; @@ -2750,21 +2907,36 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca fcc->function_handler = NULL; if (!ce_org) { + zend_string *lmname; + /* Skip leading \ */ - if (Z_STRVAL_P(callable)[0] == '\\') { - mlen = Z_STRLEN_P(callable) - 1; - lmname = zend_str_tolower_dup(Z_STRVAL_P(callable) + 1, mlen); + if (UNEXPECTED(Z_STRVAL_P(callable)[0] == '\\')) { + STR_ALLOCA_INIT(lmname, Z_STRVAL_P(callable) + 1, Z_STRLEN_P(callable) - 1, use_heap); } else { - mlen = Z_STRLEN_P(callable); - lmname = zend_str_tolower_dup(Z_STRVAL_P(callable), mlen); + lmname = Z_STR_P(callable); } /* Check if function with given name exists. * This may be a compound name that includes namespace name */ - if (zend_hash_find(EG(function_table), lmname, mlen+1, (void**)&fcc->function_handler) == SUCCESS) { - efree(lmname); + if (EXPECTED((fcc->function_handler = zend_hash_find_ptr(EG(function_table), lmname)) != NULL)) { + if (lmname != Z_STR_P(callable)) { + STR_ALLOCA_FREE(lmname, use_heap); + } return 1; + } else { + if (lmname == Z_STR_P(callable)) { + STR_ALLOCA_INIT(lmname, Z_STRVAL_P(callable), Z_STRLEN_P(callable), use_heap); + } else { + zend_string_forget_hash_val(lmname); + } + zend_str_tolower(lmname->val, lmname->len); + if ((fcc->function_handler = zend_hash_find_ptr(EG(function_table), lmname)) != NULL) { + STR_ALLOCA_FREE(lmname, use_heap); + return 1; + } + } + if (lmname != Z_STR_P(callable)) { + STR_ALLOCA_FREE(lmname, use_heap); } - efree(lmname); } /* Split name into class/namespace and method/function names */ @@ -2788,22 +2960,26 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca EG(scope) = ce_org; } - if (!zend_is_callable_check_class(Z_STRVAL_P(callable), clen, fcc, &strict_class, error TSRMLS_CC)) { + cname = zend_string_init(Z_STRVAL_P(callable), clen, 0); + if (!zend_is_callable_check_class(cname, fcc, &strict_class, error TSRMLS_CC)) { + zend_string_release(cname); EG(scope) = last_scope; return 0; } + zend_string_release(cname); EG(scope) = last_scope; ftable = &fcc->calling_scope->function_table; if (ce_org && !instanceof_function(ce_org, fcc->calling_scope TSRMLS_CC)) { - if (error) zend_spprintf(error, 0, "class '%s' is not a subclass of '%s'", ce_org->name, fcc->calling_scope->name); + if (error) zend_spprintf(error, 0, "class '%s' is not a subclass of '%s'", ce_org->name->val, fcc->calling_scope->name->val); return 0; } - mname = Z_STRVAL_P(callable) + clen + 2; + mname = zend_string_init(Z_STRVAL_P(callable) + clen + 2, mlen, 0); } else if (ce_org) { /* Try to fetch find static method of given class. */ mlen = Z_STRLEN_P(callable); - mname = Z_STRVAL_P(callable); + mname = Z_STR_P(callable); + zend_string_addref(mname); ftable = &ce_org->function_table; fcc->calling_scope = ce_org; } else { @@ -2814,23 +2990,23 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca return 0; } - lmname = zend_str_tolower_dup(mname, mlen); + lmname = zend_string_alloc(mlen, 0); + zend_str_tolower_copy(lmname->val, mname->val, mlen); if (strict_class && fcc->calling_scope && - mlen == sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1 && - !memcmp(lmname, ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME))) { + zend_string_equals_literal(lmname, ZEND_CONSTRUCTOR_FUNC_NAME)) { fcc->function_handler = fcc->calling_scope->constructor; if (fcc->function_handler) { retval = 1; } - } else if (zend_hash_find(ftable, lmname, mlen+1, (void**)&fcc->function_handler) == SUCCESS) { + } else if ((fcc->function_handler = zend_hash_find_ptr(ftable, lmname)) != NULL) { retval = 1; if ((fcc->function_handler->op_array.fn_flags & ZEND_ACC_CHANGED) && !strict_class && EG(scope) && instanceof_function(fcc->function_handler->common.scope, EG(scope) TSRMLS_CC)) { zend_function *priv_fbc; - if (zend_hash_find(&EG(scope)->function_table, lmname, mlen+1, (void **) &priv_fbc)==SUCCESS + if ((priv_fbc = zend_hash_find_ptr(&EG(scope)->function_table, lmname)) != NULL && priv_fbc->common.fn_flags & ZEND_ACC_PRIVATE && priv_fbc->common.scope == EG(scope)) { fcc->function_handler = priv_fbc; @@ -2838,10 +3014,10 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca } if ((check_flags & IS_CALLABLE_CHECK_NO_ACCESS) == 0 && (fcc->calling_scope && - ((fcc->object_ptr && fcc->calling_scope->__call) || - (!fcc->object_ptr && fcc->calling_scope->__callstatic)))) { + ((fcc->object && fcc->calling_scope->__call) || + (!fcc->object && fcc->calling_scope->__callstatic)))) { if (fcc->function_handler->op_array.fn_flags & ZEND_ACC_PRIVATE) { - if (!zend_check_private(fcc->function_handler, fcc->object_ptr ? Z_OBJCE_P(fcc->object_ptr) : EG(scope), lmname, mlen TSRMLS_CC)) { + if (!zend_check_private(fcc->function_handler, fcc->object ? fcc->object->ce : EG(scope), lmname TSRMLS_CC)) { retval = 0; fcc->function_handler = NULL; goto get_function_via_handler; @@ -2856,7 +3032,7 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca } } else { get_function_via_handler: - if (fcc->object_ptr && fcc->calling_scope == ce_org) { + if (fcc->object && fcc->calling_scope == ce_org) { if (strict_class && ce_org->__call) { fcc->function_handler = emalloc(sizeof(zend_internal_function)); fcc->function_handler->internal_function.type = ZEND_INTERNAL_FUNCTION; @@ -2866,18 +3042,19 @@ get_function_via_handler: fcc->function_handler->internal_function.num_args = 0; fcc->function_handler->internal_function.scope = ce_org; fcc->function_handler->internal_function.fn_flags = ZEND_ACC_CALL_VIA_HANDLER; - fcc->function_handler->internal_function.function_name = estrndup(mname, mlen); + fcc->function_handler->internal_function.function_name = mname; + zend_string_addref(mname); call_via_handler = 1; retval = 1; - } else if (Z_OBJ_HT_P(fcc->object_ptr)->get_method) { - fcc->function_handler = Z_OBJ_HT_P(fcc->object_ptr)->get_method(&fcc->object_ptr, mname, mlen, NULL TSRMLS_CC); + } else if (fcc->object->handlers->get_method) { + fcc->function_handler = fcc->object->handlers->get_method(&fcc->object, mname, NULL TSRMLS_CC); if (fcc->function_handler) { if (strict_class && (!fcc->function_handler->common.scope || !instanceof_function(ce_org, fcc->function_handler->common.scope TSRMLS_CC))) { if ((fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) != 0) { if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION) { - efree((char*)fcc->function_handler->common.function_name); + zend_string_release(fcc->function_handler->common.function_name); } efree(fcc->function_handler); } @@ -2889,17 +3066,16 @@ get_function_via_handler: } } else if (fcc->calling_scope) { if (fcc->calling_scope->get_static_method) { - fcc->function_handler = fcc->calling_scope->get_static_method(fcc->calling_scope, mname, mlen TSRMLS_CC); + fcc->function_handler = fcc->calling_scope->get_static_method(fcc->calling_scope, mname TSRMLS_CC); } else { - fcc->function_handler = zend_std_get_static_method(fcc->calling_scope, mname, mlen, NULL TSRMLS_CC); + fcc->function_handler = zend_std_get_static_method(fcc->calling_scope, mname, NULL TSRMLS_CC); } if (fcc->function_handler) { retval = 1; call_via_handler = (fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) != 0; - if (call_via_handler && !fcc->object_ptr && EG(This) && - Z_OBJ_HT_P(EG(This))->get_class_entry && - instanceof_function(Z_OBJCE_P(EG(This)), fcc->calling_scope TSRMLS_CC)) { - fcc->object_ptr = EG(This); + if (call_via_handler && !fcc->object && EG(current_execute_data) && Z_OBJ(EG(current_execute_data)->This) && + instanceof_function(Z_OBJCE(EG(current_execute_data)->This), fcc->calling_scope TSRMLS_CC)) { + fcc->object = Z_OBJ(EG(current_execute_data)->This); } } } @@ -2907,14 +3083,14 @@ get_function_via_handler: if (retval) { if (fcc->calling_scope && !call_via_handler) { - if (!fcc->object_ptr && (fcc->function_handler->common.fn_flags & ZEND_ACC_ABSTRACT)) { + if (!fcc->object && (fcc->function_handler->common.fn_flags & ZEND_ACC_ABSTRACT)) { if (error) { - zend_spprintf(error, 0, "cannot call abstract method %s::%s()", fcc->calling_scope->name, fcc->function_handler->common.function_name); + zend_spprintf(error, 0, "cannot call abstract method %s::%s()", fcc->calling_scope->name->val, fcc->function_handler->common.function_name->val); retval = 0; } else { - zend_error(E_ERROR, "Cannot call abstract method %s::%s()", fcc->calling_scope->name, fcc->function_handler->common.function_name); + zend_error(E_ERROR, "Cannot call abstract method %s::%s()", fcc->calling_scope->name->val, fcc->function_handler->common.function_name->val); } - } else if (!fcc->object_ptr && !(fcc->function_handler->common.fn_flags & ZEND_ACC_STATIC)) { + } else if (!fcc->object && !(fcc->function_handler->common.fn_flags & ZEND_ACC_STATIC)) { int severity; char *verb; if (fcc->function_handler->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { @@ -2928,35 +3104,35 @@ get_function_via_handler: if ((check_flags & IS_CALLABLE_CHECK_IS_STATIC) != 0) { retval = 0; } - if (EG(This) && instanceof_function(Z_OBJCE_P(EG(This)), fcc->calling_scope TSRMLS_CC)) { - fcc->object_ptr = EG(This); + if (EG(current_execute_data) && Z_OBJ(EG(current_execute_data)->This) && instanceof_function(Z_OBJCE(EG(current_execute_data)->This), fcc->calling_scope TSRMLS_CC)) { + fcc->object = Z_OBJ(EG(current_execute_data)->This); if (error) { - zend_spprintf(error, 0, "non-static method %s::%s() %s be called statically, assuming $this from compatible context %s", fcc->calling_scope->name, fcc->function_handler->common.function_name, verb, Z_OBJCE_P(EG(This))->name); + zend_spprintf(error, 0, "non-static method %s::%s() %s be called statically, assuming $this from compatible context %s", fcc->calling_scope->name->val, fcc->function_handler->common.function_name->val, verb, Z_OBJCE(EG(current_execute_data)->This)->name->val); if (severity == E_ERROR) { retval = 0; } } else if (retval) { - zend_error(severity, "Non-static method %s::%s() %s be called statically, assuming $this from compatible context %s", fcc->calling_scope->name, fcc->function_handler->common.function_name, verb, Z_OBJCE_P(EG(This))->name); + zend_error(severity, "Non-static method %s::%s() %s be called statically, assuming $this from compatible context %s", fcc->calling_scope->name->val, fcc->function_handler->common.function_name->val, verb, Z_OBJCE(EG(current_execute_data)->This)->name->val); } } else { if (error) { - zend_spprintf(error, 0, "non-static method %s::%s() %s be called statically", fcc->calling_scope->name, fcc->function_handler->common.function_name, verb); + zend_spprintf(error, 0, "non-static method %s::%s() %s be called statically", fcc->calling_scope->name->val, fcc->function_handler->common.function_name->val, verb); if (severity == E_ERROR) { retval = 0; } } else if (retval) { - zend_error(severity, "Non-static method %s::%s() %s be called statically", fcc->calling_scope->name, fcc->function_handler->common.function_name, verb); + zend_error(severity, "Non-static method %s::%s() %s be called statically", fcc->calling_scope->name->val, fcc->function_handler->common.function_name->val, verb); } } } if (retval && (check_flags & IS_CALLABLE_CHECK_NO_ACCESS) == 0) { if (fcc->function_handler->op_array.fn_flags & ZEND_ACC_PRIVATE) { - if (!zend_check_private(fcc->function_handler, fcc->object_ptr ? Z_OBJCE_P(fcc->object_ptr) : EG(scope), lmname, mlen TSRMLS_CC)) { + if (!zend_check_private(fcc->function_handler, fcc->object ? fcc->object->ce : EG(scope), lmname TSRMLS_CC)) { if (error) { if (*error) { efree(*error); } - zend_spprintf(error, 0, "cannot access private method %s::%s()", fcc->calling_scope->name, fcc->function_handler->common.function_name); + zend_spprintf(error, 0, "cannot access private method %s::%s()", fcc->calling_scope->name->val, fcc->function_handler->common.function_name->val); } retval = 0; } @@ -2966,7 +3142,7 @@ get_function_via_handler: if (*error) { efree(*error); } - zend_spprintf(error, 0, "cannot access protected method %s::%s()", fcc->calling_scope->name, fcc->function_handler->common.function_name); + zend_spprintf(error, 0, "cannot access protected method %s::%s()", fcc->calling_scope->name->val, fcc->function_handler->common.function_name->val); } retval = 0; } @@ -2975,15 +3151,16 @@ get_function_via_handler: } } else if (error && !(check_flags & IS_CALLABLE_CHECK_SILENT)) { if (fcc->calling_scope) { - if (error) zend_spprintf(error, 0, "class '%s' does not have a method '%s'", fcc->calling_scope->name, mname); + if (error) zend_spprintf(error, 0, "class '%s' does not have a method '%s'", fcc->calling_scope->name->val, mname->val); } else { - if (error) zend_spprintf(error, 0, "function '%s' does not exist", mname); + if (error) zend_spprintf(error, 0, "function '%s' does not exist", mname->val); } } - efree(lmname); + zend_string_free(lmname); + zend_string_release(mname); - if (fcc->object_ptr) { - fcc->called_scope = Z_OBJCE_P(fcc->object_ptr); + if (fcc->object) { + fcc->called_scope = fcc->object->ce; } if (retval) { fcc->initialized = 1; @@ -2992,18 +3169,14 @@ get_function_via_handler: } /* }}} */ -ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint check_flags, char **callable_name, int *callable_name_len, zend_fcall_info_cache *fcc, char **error TSRMLS_DC) /* {{{ */ +ZEND_API zend_bool zend_is_callable_ex(zval *callable, zend_object *object, uint check_flags, zend_string **callable_name, zend_fcall_info_cache *fcc, char **error TSRMLS_DC) /* {{{ */ { zend_bool ret; - int callable_name_len_local; zend_fcall_info_cache fcc_local; if (callable_name) { *callable_name = NULL; } - if (callable_name_len == NULL) { - callable_name_len = &callable_name_len_local; - } if (fcc == NULL) { fcc = &fcc_local; } @@ -3016,36 +3189,32 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint ch fcc->called_scope = NULL; fcc->function_handler = NULL; fcc->calling_scope = NULL; - fcc->object_ptr = NULL; + fcc->object = NULL; - if (object_ptr && Z_TYPE_P(object_ptr) != IS_OBJECT) { - object_ptr = NULL; - } - if (object_ptr && - (!EG(objects_store).object_buckets || - !EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(object_ptr)].valid)) { + if (object && + (!EG(objects_store).object_buckets || + !IS_OBJ_VALID(EG(objects_store).object_buckets[object->handle]))) { return 0; } switch (Z_TYPE_P(callable)) { case IS_STRING: - if (object_ptr) { - fcc->object_ptr = object_ptr; - fcc->calling_scope = Z_OBJCE_P(object_ptr); + if (object) { + fcc->object = object; + fcc->calling_scope = object->ce; if (callable_name) { char *ptr; - *callable_name_len = fcc->calling_scope->name_length + Z_STRLEN_P(callable) + sizeof("::") - 1; - ptr = *callable_name = emalloc(*callable_name_len + 1); - memcpy(ptr, fcc->calling_scope->name, fcc->calling_scope->name_length); - ptr += fcc->calling_scope->name_length; + *callable_name = zend_string_alloc(fcc->calling_scope->name->len + Z_STRLEN_P(callable) + sizeof("::") - 1, 0); + ptr = (*callable_name)->val; + memcpy(ptr, fcc->calling_scope->name->val, fcc->calling_scope->name->len); + ptr += fcc->calling_scope->name->len; memcpy(ptr, "::", sizeof("::") - 1); ptr += sizeof("::") - 1; memcpy(ptr, Z_STRVAL_P(callable), Z_STRLEN_P(callable) + 1); } } else if (callable_name) { - *callable_name = estrndup(Z_STRVAL_P(callable), Z_STRLEN_P(callable)); - *callable_name_len = Z_STRLEN_P(callable); + *callable_name = zend_string_copy(Z_STR_P(callable)); } if (check_flags & IS_CALLABLE_CHECK_SYNTAX_ONLY) { fcc->called_scope = fcc->calling_scope; @@ -3060,7 +3229,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint ch fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY || fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION)) { if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION) { - efree((char*)fcc->function_handler->common.function_name); + zend_string_release(fcc->function_handler->common.function_name); } efree(fcc->function_handler); } @@ -3068,69 +3237,79 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint ch case IS_ARRAY: { - zval **method = NULL; - zval **obj = NULL; + zval *method = NULL; + zval *obj = NULL; int strict_class = 0; if (zend_hash_num_elements(Z_ARRVAL_P(callable)) == 2) { - zend_hash_index_find(Z_ARRVAL_P(callable), 0, (void **) &obj); - zend_hash_index_find(Z_ARRVAL_P(callable), 1, (void **) &method); + obj = zend_hash_index_find(Z_ARRVAL_P(callable), 0); + method = zend_hash_index_find(Z_ARRVAL_P(callable), 1); } - if (obj && method && - (Z_TYPE_PP(obj) == IS_OBJECT || - Z_TYPE_PP(obj) == IS_STRING) && - Z_TYPE_PP(method) == IS_STRING) { - if (Z_TYPE_PP(obj) == IS_STRING) { + do { + if (obj == NULL || method == NULL) { + break; + } + + ZVAL_DEREF(method); + if (Z_TYPE_P(method) != IS_STRING) { + break; + } + + ZVAL_DEREF(obj); + if (Z_TYPE_P(obj) == IS_STRING) { if (callable_name) { char *ptr; - *callable_name_len = Z_STRLEN_PP(obj) + Z_STRLEN_PP(method) + sizeof("::") - 1; - ptr = *callable_name = emalloc(*callable_name_len + 1); - memcpy(ptr, Z_STRVAL_PP(obj), Z_STRLEN_PP(obj)); - ptr += Z_STRLEN_PP(obj); + + *callable_name = zend_string_alloc(Z_STRLEN_P(obj) + Z_STRLEN_P(method) + sizeof("::") - 1, 0); + ptr = (*callable_name)->val; + memcpy(ptr, Z_STRVAL_P(obj), Z_STRLEN_P(obj)); + ptr += Z_STRLEN_P(obj); memcpy(ptr, "::", sizeof("::") - 1); ptr += sizeof("::") - 1; - memcpy(ptr, Z_STRVAL_PP(method), Z_STRLEN_PP(method) + 1); + memcpy(ptr, Z_STRVAL_P(method), Z_STRLEN_P(method) + 1); } if (check_flags & IS_CALLABLE_CHECK_SYNTAX_ONLY) { return 1; } - if (!zend_is_callable_check_class(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj), fcc, &strict_class, error TSRMLS_CC)) { + if (!zend_is_callable_check_class(Z_STR_P(obj), fcc, &strict_class, error TSRMLS_CC)) { return 0; } - } else { - if (!EG(objects_store).object_buckets || - !EG(objects_store).object_buckets[Z_OBJ_HANDLE_PP(obj)].valid) { + } else if (Z_TYPE_P(obj) == IS_OBJECT) { + if (!EG(objects_store).object_buckets || + !IS_OBJ_VALID(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(obj)])) { return 0; } - fcc->calling_scope = Z_OBJCE_PP(obj); /* TBFixed: what if it's overloaded? */ + fcc->calling_scope = Z_OBJCE_P(obj); /* TBFixed: what if it's overloaded? */ - fcc->object_ptr = *obj; + fcc->object = Z_OBJ_P(obj); if (callable_name) { char *ptr; - *callable_name_len = fcc->calling_scope->name_length + Z_STRLEN_PP(method) + sizeof("::") - 1; - ptr = *callable_name = emalloc(*callable_name_len + 1); - memcpy(ptr, fcc->calling_scope->name, fcc->calling_scope->name_length); - ptr += fcc->calling_scope->name_length; + *callable_name = zend_string_alloc(fcc->calling_scope->name->len + Z_STRLEN_P(method) + sizeof("::") - 1, 0); + ptr = (*callable_name)->val; + memcpy(ptr, fcc->calling_scope->name->val, fcc->calling_scope->name->len); + ptr += fcc->calling_scope->name->len; memcpy(ptr, "::", sizeof("::") - 1); ptr += sizeof("::") - 1; - memcpy(ptr, Z_STRVAL_PP(method), Z_STRLEN_PP(method) + 1); + memcpy(ptr, Z_STRVAL_P(method), Z_STRLEN_P(method) + 1); } if (check_flags & IS_CALLABLE_CHECK_SYNTAX_ONLY) { fcc->called_scope = fcc->calling_scope; return 1; } + } else { + break; } - ret = zend_is_callable_check_func(check_flags, *method, fcc, strict_class, error TSRMLS_CC); + ret = zend_is_callable_check_func(check_flags, method, fcc, strict_class, error TSRMLS_CC); if (fcc == &fcc_local && fcc->function_handler && ((fcc->function_handler->type == ZEND_INTERNAL_FUNCTION && @@ -3138,40 +3317,39 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint ch fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY || fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION)) { if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION) { - efree((char*)fcc->function_handler->common.function_name); + zend_string_release(fcc->function_handler->common.function_name); } efree(fcc->function_handler); } return ret; - } else { - if (zend_hash_num_elements(Z_ARRVAL_P(callable)) == 2) { - if (!obj || (Z_TYPE_PP(obj) != IS_STRING && Z_TYPE_PP(obj) != IS_OBJECT)) { - if (error) zend_spprintf(error, 0, "first array member is not a valid class name or object"); - } else { - if (error) zend_spprintf(error, 0, "second array member is not a valid method"); - } + } while (0); + if (zend_hash_num_elements(Z_ARRVAL_P(callable)) == 2) { + if (!obj || (!Z_ISREF_P(obj)? + (Z_TYPE_P(obj) != IS_STRING && Z_TYPE_P(obj) != IS_OBJECT) : + (Z_TYPE_P(Z_REFVAL_P(obj)) != IS_STRING && Z_TYPE_P(Z_REFVAL_P(obj)) != IS_OBJECT))) { + if (error) zend_spprintf(error, 0, "first array member is not a valid class name or object"); } else { - if (error) zend_spprintf(error, 0, "array must have exactly two members"); - } - if (callable_name) { - *callable_name = estrndup("Array", sizeof("Array")-1); - *callable_name_len = sizeof("Array") - 1; + if (error) zend_spprintf(error, 0, "second array member is not a valid method"); } + } else { + if (error) zend_spprintf(error, 0, "array must have exactly two members"); + } + if (callable_name) { + *callable_name = zend_string_init("Array", sizeof("Array")-1, 0); } } return 0; case IS_OBJECT: - if (Z_OBJ_HANDLER_P(callable, get_closure) && Z_OBJ_HANDLER_P(callable, get_closure)(callable, &fcc->calling_scope, &fcc->function_handler, &fcc->object_ptr TSRMLS_CC) == SUCCESS) { + if (Z_OBJ_HANDLER_P(callable, get_closure) && Z_OBJ_HANDLER_P(callable, get_closure)(callable, &fcc->calling_scope, &fcc->function_handler, &fcc->object TSRMLS_CC) == SUCCESS) { fcc->called_scope = fcc->calling_scope; if (callable_name) { zend_class_entry *ce = Z_OBJCE_P(callable); /* TBFixed: what if it's overloaded? */ - *callable_name_len = ce->name_length + sizeof("::__invoke") - 1; - *callable_name = emalloc(*callable_name_len + 1); - memcpy(*callable_name, ce->name, ce->name_length); - memcpy((*callable_name) + ce->name_length, "::__invoke", sizeof("::__invoke")); + *callable_name = zend_string_alloc(ce->name->len + sizeof("::__invoke") - 1, 0); + memcpy((*callable_name)->val, ce->name->val, ce->name->len); + memcpy((*callable_name)->val + ce->name->len, "::__invoke", sizeof("::__invoke")); } return 1; } @@ -3179,13 +3357,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint ch default: if (callable_name) { - zval expr_copy; - int use_copy; - - zend_make_printable_zval(callable, &expr_copy, &use_copy); - *callable_name = estrndup(Z_STRVAL(expr_copy), Z_STRLEN(expr_copy)); - *callable_name_len = Z_STRLEN(expr_copy); - zval_dtor(&expr_copy); + *callable_name = zval_get_string(callable); } if (error) zend_spprintf(error, 0, "no array or string given"); return 0; @@ -3193,22 +3365,22 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint ch } /* }}} */ -ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, char **callable_name TSRMLS_DC) /* {{{ */ +ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, zend_string **callable_name TSRMLS_DC) /* {{{ */ { - return zend_is_callable_ex(callable, NULL, check_flags, callable_name, NULL, NULL, NULL TSRMLS_CC); + return zend_is_callable_ex(callable, NULL, check_flags, callable_name, NULL, NULL TSRMLS_CC); } /* }}} */ -ZEND_API zend_bool zend_make_callable(zval *callable, char **callable_name TSRMLS_DC) /* {{{ */ +ZEND_API zend_bool zend_make_callable(zval *callable, zend_string **callable_name TSRMLS_DC) /* {{{ */ { zend_fcall_info_cache fcc; - if (zend_is_callable_ex(callable, NULL, IS_CALLABLE_STRICT, callable_name, NULL, &fcc, NULL TSRMLS_CC)) { + if (zend_is_callable_ex(callable, NULL, IS_CALLABLE_STRICT, callable_name, &fcc, NULL TSRMLS_CC)) { if (Z_TYPE_P(callable) == IS_STRING && fcc.calling_scope) { zval_dtor(callable); array_init(callable); - add_next_index_string(callable, fcc.calling_scope->name, 1); - add_next_index_string(callable, fcc.function_handler->common.function_name, 1); + add_next_index_str(callable, zend_string_copy(fcc.calling_scope->name)); + add_next_index_str(callable, zend_string_copy(fcc.function_handler->common.function_name)); } if (fcc.function_handler && ((fcc.function_handler->type == ZEND_INTERNAL_FUNCTION && @@ -3216,7 +3388,7 @@ ZEND_API zend_bool zend_make_callable(zval *callable, char **callable_name TSRML fcc.function_handler->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY || fcc.function_handler->type == ZEND_OVERLOADED_FUNCTION)) { if (fcc.function_handler->type != ZEND_OVERLOADED_FUNCTION) { - efree((char*)fcc.function_handler->common.function_name); + zend_string_release(fcc.function_handler->common.function_name); } efree(fcc.function_handler); } @@ -3226,17 +3398,17 @@ ZEND_API zend_bool zend_make_callable(zval *callable, char **callable_name TSRML } /* }}} */ -ZEND_API int zend_fcall_info_init(zval *callable, uint check_flags, zend_fcall_info *fci, zend_fcall_info_cache *fcc, char **callable_name, char **error TSRMLS_DC) /* {{{ */ +ZEND_API int zend_fcall_info_init(zval *callable, uint check_flags, zend_fcall_info *fci, zend_fcall_info_cache *fcc, zend_string **callable_name, char **error TSRMLS_DC) /* {{{ */ { - if (!zend_is_callable_ex(callable, NULL, check_flags, callable_name, NULL, fcc, error TSRMLS_CC)) { + if (!zend_is_callable_ex(callable, NULL, check_flags, callable_name, fcc, error TSRMLS_CC)) { return FAILURE; } fci->size = sizeof(*fci); fci->function_table = fcc->calling_scope ? &fcc->calling_scope->function_table : EG(function_table); - fci->object_ptr = fcc->object_ptr; - fci->function_name = callable; - fci->retval_ptr_ptr = NULL; + fci->object = fcc->object; + ZVAL_COPY_VALUE(&fci->function_name, callable); + fci->retval = NULL; fci->param_count = 0; fci->params = NULL; fci->no_separation = 1; @@ -3249,6 +3421,11 @@ ZEND_API int zend_fcall_info_init(zval *callable, uint check_flags, zend_fcall_i ZEND_API void zend_fcall_info_args_clear(zend_fcall_info *fci, int free_mem) /* {{{ */ { if (fci->params) { + uint32_t i; + + for (i = 0; i < fci->param_count; i++) { + zval_ptr_dtor(&fci->params[i]); + } if (free_mem) { efree(fci->params); fci->params = NULL; @@ -3258,7 +3435,7 @@ ZEND_API void zend_fcall_info_args_clear(zend_fcall_info *fci, int free_mem) /* } /* }}} */ -ZEND_API void zend_fcall_info_args_save(zend_fcall_info *fci, int *param_count, zval ****params) /* {{{ */ +ZEND_API void zend_fcall_info_args_save(zend_fcall_info *fci, int *param_count, zval **params) /* {{{ */ { *param_count = fci->param_count; *params = fci->params; @@ -3267,7 +3444,7 @@ ZEND_API void zend_fcall_info_args_save(zend_fcall_info *fci, int *param_count, } /* }}} */ -ZEND_API void zend_fcall_info_args_restore(zend_fcall_info *fci, int param_count, zval ***params) /* {{{ */ +ZEND_API void zend_fcall_info_args_restore(zend_fcall_info *fci, int param_count, zval *params) /* {{{ */ { zend_fcall_info_args_clear(fci, 1); fci->param_count = param_count; @@ -3275,10 +3452,10 @@ ZEND_API void zend_fcall_info_args_restore(zend_fcall_info *fci, int param_count } /* }}} */ -ZEND_API int zend_fcall_info_args(zend_fcall_info *fci, zval *args TSRMLS_DC) /* {{{ */ +ZEND_API int zend_fcall_info_args_ex(zend_fcall_info *fci, zend_function *func, zval *args TSRMLS_DC) /* {{{ */ { - HashPosition pos; - zval **arg, ***params; + zval *arg, *params; + uint32_t n = 1; zend_fcall_info_args_clear(fci, !args); @@ -3291,19 +3468,32 @@ ZEND_API int zend_fcall_info_args(zend_fcall_info *fci, zval *args TSRMLS_DC) /* } fci->param_count = zend_hash_num_elements(Z_ARRVAL_P(args)); - fci->params = params = (zval ***) erealloc(fci->params, fci->param_count * sizeof(zval **)); + fci->params = params = (zval *) erealloc(fci->params, fci->param_count * sizeof(zval)); - zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(args), &pos); - while (zend_hash_get_current_data_ex(Z_ARRVAL_P(args), (void *) &arg, &pos) == SUCCESS) { - *params++ = arg; - zend_hash_move_forward_ex(Z_ARRVAL_P(args), &pos); - } + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(args), arg) { + if (func && !Z_ISREF_P(arg) && ARG_SHOULD_BE_SENT_BY_REF(func, n)) { + ZVAL_NEW_REF(params, arg); + if (Z_REFCOUNTED_P(arg)) { + Z_ADDREF_P(arg); + } + } else { + ZVAL_COPY(params, arg); + } + params++; + n++; + } ZEND_HASH_FOREACH_END(); return SUCCESS; } /* }}} */ -ZEND_API int zend_fcall_info_argp(zend_fcall_info *fci TSRMLS_DC, int argc, zval ***argv) /* {{{ */ +ZEND_API int zend_fcall_info_args(zend_fcall_info *fci, zval *args TSRMLS_DC) /* {{{ */ +{ + return zend_fcall_info_args_ex(fci, NULL, args TSRMLS_CC); +} +/* }}} */ + +ZEND_API int zend_fcall_info_argp(zend_fcall_info *fci TSRMLS_DC, int argc, zval *argv) /* {{{ */ { int i; @@ -3315,10 +3505,10 @@ ZEND_API int zend_fcall_info_argp(zend_fcall_info *fci TSRMLS_DC, int argc, zval if (argc) { fci->param_count = argc; - fci->params = (zval ***) erealloc(fci->params, fci->param_count * sizeof(zval **)); + fci->params = (zval *) erealloc(fci->params, fci->param_count * sizeof(zval)); for (i = 0; i < argc; ++i) { - fci->params[i] = argv[i]; + ZVAL_COPY_VALUE(&fci->params[i], &argv[i]); } } @@ -3329,7 +3519,7 @@ ZEND_API int zend_fcall_info_argp(zend_fcall_info *fci TSRMLS_DC, int argc, zval ZEND_API int zend_fcall_info_argv(zend_fcall_info *fci TSRMLS_DC, int argc, va_list *argv) /* {{{ */ { int i; - zval **arg; + zval *arg; if (argc < 0) { return FAILURE; @@ -3339,11 +3529,11 @@ ZEND_API int zend_fcall_info_argv(zend_fcall_info *fci TSRMLS_DC, int argc, va_l if (argc) { fci->param_count = argc; - fci->params = (zval ***) erealloc(fci->params, fci->param_count * sizeof(zval **)); + fci->params = (zval *) erealloc(fci->params, fci->param_count * sizeof(zval)); for (i = 0; i < argc; ++i) { - arg = va_arg(*argv, zval **); - fci->params[i] = arg; + arg = va_arg(*argv, zval *); + ZVAL_COPY_VALUE(&fci->params[i], arg); } } @@ -3364,19 +3554,19 @@ ZEND_API int zend_fcall_info_argn(zend_fcall_info *fci TSRMLS_DC, int argc, ...) } /* }}} */ -ZEND_API int zend_fcall_info_call(zend_fcall_info *fci, zend_fcall_info_cache *fcc, zval **retval_ptr_ptr, zval *args TSRMLS_DC) /* {{{ */ +ZEND_API int zend_fcall_info_call(zend_fcall_info *fci, zend_fcall_info_cache *fcc, zval *retval_ptr, zval *args TSRMLS_DC) /* {{{ */ { - zval *retval, ***org_params = NULL; + zval retval, *org_params = NULL; int result, org_count = 0; - fci->retval_ptr_ptr = retval_ptr_ptr ? retval_ptr_ptr : &retval; + fci->retval = retval_ptr ? retval_ptr : &retval; if (args) { zend_fcall_info_args_save(fci, &org_count, &org_params); zend_fcall_info_args(fci, args TSRMLS_CC); } result = zend_call_function(fci, fcc TSRMLS_CC); - if (!retval_ptr_ptr && retval) { + if (!retval_ptr && Z_TYPE(retval) != IS_UNDEF) { zval_ptr_dtor(&retval); } if (args) { @@ -3388,59 +3578,63 @@ ZEND_API int zend_fcall_info_call(zend_fcall_info *fci, zend_fcall_info_cache *f ZEND_API const char *zend_get_module_version(const char *module_name) /* {{{ */ { - char *lname; + zend_string *lname; int name_len = strlen(module_name); zend_module_entry *module; - lname = zend_str_tolower_dup(module_name, name_len); - if (zend_hash_find(&module_registry, lname, name_len + 1, (void**)&module) == FAILURE) { - efree(lname); - return NULL; - } - efree(lname); - return module->version; + lname = zend_string_alloc(name_len, 0); + zend_str_tolower_copy(lname->val, module_name, name_len); + module = zend_hash_find_ptr(&module_registry, lname); + zend_string_free(lname); + return module ? module->version : NULL; } /* }}} */ -ZEND_API int zend_declare_property_ex(zend_class_entry *ce, const char *name, int name_length, zval *property, int access_type, const char *doc_comment, int doc_comment_len TSRMLS_DC) /* {{{ */ +ZEND_API int zend_declare_property_ex(zend_class_entry *ce, zend_string *name, zval *property, int access_type, zend_string *doc_comment TSRMLS_DC) /* {{{ */ { - zend_property_info property_info, *property_info_ptr; - const char *interned_name; - ulong h = zend_get_hash_value(name, name_length+1); + zend_property_info *property_info, *property_info_ptr; + if (ce->type == ZEND_INTERNAL_CLASS) { + property_info = pemalloc(sizeof(zend_property_info), 1); + } else { + property_info = zend_arena_alloc(&CG(arena), sizeof(zend_property_info)); + } + + if (Z_CONSTANT_P(property)) { + ce->ce_flags &= ~ZEND_ACC_CONSTANTS_UPDATED; + } if (!(access_type & ZEND_ACC_PPP_MASK)) { access_type |= ZEND_ACC_PUBLIC; } if (access_type & ZEND_ACC_STATIC) { - if (zend_hash_quick_find(&ce->properties_info, name, name_length + 1, h, (void**)&property_info_ptr) == SUCCESS && + if ((property_info_ptr = zend_hash_find_ptr(&ce->properties_info, name)) != NULL && (property_info_ptr->flags & ZEND_ACC_STATIC) != 0) { - property_info.offset = property_info_ptr->offset; - zval_ptr_dtor(&ce->default_static_members_table[property_info.offset]); - zend_hash_quick_del(&ce->properties_info, name, name_length + 1, h); + property_info->offset = property_info_ptr->offset; + zval_ptr_dtor(&ce->default_static_members_table[property_info->offset]); + zend_hash_del(&ce->properties_info, name); } else { - property_info.offset = ce->default_static_members_count++; - ce->default_static_members_table = perealloc(ce->default_static_members_table, sizeof(zval*) * ce->default_static_members_count, ce->type == ZEND_INTERNAL_CLASS); + property_info->offset = ce->default_static_members_count++; + ce->default_static_members_table = perealloc(ce->default_static_members_table, sizeof(zval) * ce->default_static_members_count, ce->type == ZEND_INTERNAL_CLASS); } - ce->default_static_members_table[property_info.offset] = property; + ZVAL_COPY_VALUE(&ce->default_static_members_table[property_info->offset], property); if (ce->type == ZEND_USER_CLASS) { ce->static_members_table = ce->default_static_members_table; } } else { - if (zend_hash_quick_find(&ce->properties_info, name, name_length + 1, h, (void**)&property_info_ptr) == SUCCESS && + if ((property_info_ptr = zend_hash_find_ptr(&ce->properties_info, name)) != NULL && (property_info_ptr->flags & ZEND_ACC_STATIC) == 0) { - property_info.offset = property_info_ptr->offset; - zval_ptr_dtor(&ce->default_properties_table[property_info.offset]); - zend_hash_quick_del(&ce->properties_info, name, name_length + 1, h); + property_info->offset = property_info_ptr->offset; + zval_ptr_dtor(&ce->default_properties_table[property_info->offset]); + zend_hash_del(&ce->properties_info, name); } else { - property_info.offset = ce->default_properties_count++; - ce->default_properties_table = perealloc(ce->default_properties_table, sizeof(zval*) * ce->default_properties_count, ce->type == ZEND_INTERNAL_CLASS); + property_info->offset = ce->default_properties_count++; + ce->default_properties_table = perealloc(ce->default_properties_table, sizeof(zval) * ce->default_properties_count, ce->type == ZEND_INTERNAL_CLASS); } - ce->default_properties_table[property_info.offset] = property; + ZVAL_COPY_VALUE(&ce->default_properties_table[property_info->offset], property); } if (ce->type & ZEND_INTERNAL_CLASS) { switch(Z_TYPE_P(property)) { case IS_ARRAY: - case IS_CONSTANT_ARRAY: case IS_OBJECT: case IS_RESOURCE: zend_error(E_CORE_ERROR, "Internal zval's can't be arrays, objects or resources"); @@ -3451,52 +3645,23 @@ ZEND_API int zend_declare_property_ex(zend_class_entry *ce, const char *name, in } switch (access_type & ZEND_ACC_PPP_MASK) { case ZEND_ACC_PRIVATE: { - char *priv_name; - int priv_name_length; - - zend_mangle_property_name(&priv_name, &priv_name_length, ce->name, ce->name_length, name, name_length, ce->type & ZEND_INTERNAL_CLASS); - property_info.name = priv_name; - property_info.name_length = priv_name_length; + property_info->name = zend_mangle_property_name(ce->name->val, ce->name->len, name->val, name->len, ce->type & ZEND_INTERNAL_CLASS); } break; case ZEND_ACC_PROTECTED: { - char *prot_name; - int prot_name_length; - - zend_mangle_property_name(&prot_name, &prot_name_length, "*", 1, name, name_length, ce->type & ZEND_INTERNAL_CLASS); - property_info.name = prot_name; - property_info.name_length = prot_name_length; + property_info->name = zend_mangle_property_name("*", 1, name->val, name->len, ce->type & ZEND_INTERNAL_CLASS); } break; case ZEND_ACC_PUBLIC: - if (IS_INTERNED(name)) { - property_info.name = (char*)name; - } else { - property_info.name = ce->type & ZEND_INTERNAL_CLASS ? zend_strndup(name, name_length) : estrndup(name, name_length); - } - property_info.name_length = name_length; + property_info->name = zend_string_copy(name); break; } - interned_name = zend_new_interned_string(property_info.name, property_info.name_length+1, 0 TSRMLS_CC); - if (interned_name != property_info.name) { - if (ce->type == ZEND_USER_CLASS) { - efree((char*)property_info.name); - } else { - free((char*)property_info.name); - } - property_info.name = interned_name; - } - - property_info.flags = access_type; - property_info.h = (access_type & ZEND_ACC_PUBLIC) ? h : zend_get_hash_value(property_info.name, property_info.name_length+1); - - property_info.doc_comment = doc_comment; - property_info.doc_comment_len = doc_comment_len; - - property_info.ce = ce; - - zend_hash_quick_update(&ce->properties_info, name, name_length+1, h, &property_info, sizeof(zend_property_info), NULL); + property_info->name = zend_new_interned_string(property_info->name TSRMLS_CC); + property_info->flags = access_type; + property_info->doc_comment = doc_comment; + property_info->ce = ce; + zend_hash_update_ptr(&ce->properties_info, name, property_info); return SUCCESS; } @@ -3504,181 +3669,119 @@ ZEND_API int zend_declare_property_ex(zend_class_entry *ce, const char *name, in ZEND_API int zend_declare_property(zend_class_entry *ce, const char *name, int name_length, zval *property, int access_type TSRMLS_DC) /* {{{ */ { - return zend_declare_property_ex(ce, name, name_length, property, access_type, NULL, 0 TSRMLS_CC); + zend_string *key = zend_string_init(name, name_length, ce->type & ZEND_INTERNAL_CLASS); + int ret = zend_declare_property_ex(ce, key, property, access_type, NULL TSRMLS_CC); + zend_string_release(key); + return ret; } /* }}} */ ZEND_API int zend_declare_property_null(zend_class_entry *ce, const char *name, int name_length, int access_type TSRMLS_DC) /* {{{ */ { - zval *property; + zval property; - if (ce->type & ZEND_INTERNAL_CLASS) { - ALLOC_PERMANENT_ZVAL(property); - } else { - ALLOC_ZVAL(property); - } - INIT_ZVAL(*property); - return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC); + ZVAL_NULL(&property); + return zend_declare_property(ce, name, name_length, &property, access_type TSRMLS_CC); } /* }}} */ -ZEND_API int zend_declare_property_bool(zend_class_entry *ce, const char *name, int name_length, long value, int access_type TSRMLS_DC) /* {{{ */ +ZEND_API int zend_declare_property_bool(zend_class_entry *ce, const char *name, int name_length, zend_long value, int access_type TSRMLS_DC) /* {{{ */ { - zval *property; + zval property; - if (ce->type & ZEND_INTERNAL_CLASS) { - ALLOC_PERMANENT_ZVAL(property); - } else { - ALLOC_ZVAL(property); - } - INIT_PZVAL(property); - ZVAL_BOOL(property, value); - return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC); + ZVAL_BOOL(&property, value); + return zend_declare_property(ce, name, name_length, &property, access_type TSRMLS_CC); } /* }}} */ -ZEND_API int zend_declare_property_long(zend_class_entry *ce, const char *name, int name_length, long value, int access_type TSRMLS_DC) /* {{{ */ +ZEND_API int zend_declare_property_long(zend_class_entry *ce, const char *name, int name_length, zend_long value, int access_type TSRMLS_DC) /* {{{ */ { - zval *property; + zval property; - if (ce->type & ZEND_INTERNAL_CLASS) { - ALLOC_PERMANENT_ZVAL(property); - } else { - ALLOC_ZVAL(property); - } - INIT_PZVAL(property); - ZVAL_LONG(property, value); - return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC); + ZVAL_LONG(&property, value); + return zend_declare_property(ce, name, name_length, &property, access_type TSRMLS_CC); } /* }}} */ ZEND_API int zend_declare_property_double(zend_class_entry *ce, const char *name, int name_length, double value, int access_type TSRMLS_DC) /* {{{ */ { - zval *property; + zval property; - if (ce->type & ZEND_INTERNAL_CLASS) { - ALLOC_PERMANENT_ZVAL(property); - } else { - ALLOC_ZVAL(property); - } - INIT_PZVAL(property); - ZVAL_DOUBLE(property, value); - return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC); + ZVAL_DOUBLE(&property, value); + return zend_declare_property(ce, name, name_length, &property, access_type TSRMLS_CC); } /* }}} */ ZEND_API int zend_declare_property_string(zend_class_entry *ce, const char *name, int name_length, const char *value, int access_type TSRMLS_DC) /* {{{ */ { - zval *property; - int len = strlen(value); + zval property; - if (ce->type & ZEND_INTERNAL_CLASS) { - ALLOC_PERMANENT_ZVAL(property); - ZVAL_STRINGL(property, zend_strndup(value, len), len, 0); - } else { - ALLOC_ZVAL(property); - ZVAL_STRINGL(property, value, len, 1); - } - INIT_PZVAL(property); - return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC); + ZVAL_NEW_STR(&property, zend_string_init(value, strlen(value), ce->type & ZEND_INTERNAL_CLASS)); + return zend_declare_property(ce, name, name_length, &property, access_type TSRMLS_CC); } /* }}} */ -ZEND_API int zend_declare_property_stringl(zend_class_entry *ce, const char *name, int name_length, const char *value, int value_len, int access_type TSRMLS_DC) /* {{{ */ +ZEND_API int zend_declare_property_stringl(zend_class_entry *ce, const char *name, int name_length, const char *value, size_t value_len, int access_type TSRMLS_DC) /* {{{ */ { - zval *property; + zval property; - if (ce->type & ZEND_INTERNAL_CLASS) { - ALLOC_PERMANENT_ZVAL(property); - ZVAL_STRINGL(property, zend_strndup(value, value_len), value_len, 0); - } else { - ALLOC_ZVAL(property); - ZVAL_STRINGL(property, value, value_len, 1); - } - INIT_PZVAL(property); - return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC); + ZVAL_NEW_STR(&property, zend_string_init(value, value_len, ce->type & ZEND_INTERNAL_CLASS)); + return zend_declare_property(ce, name, name_length, &property, access_type TSRMLS_CC); } /* }}} */ ZEND_API int zend_declare_class_constant(zend_class_entry *ce, const char *name, size_t name_length, zval *value TSRMLS_DC) /* {{{ */ { - return zend_hash_update(&ce->constants_table, name, name_length+1, &value, sizeof(zval *), NULL); + if (Z_CONSTANT_P(value)) { + ce->ce_flags &= ~ZEND_ACC_CONSTANTS_UPDATED; + } + return zend_hash_str_update(&ce->constants_table, name, name_length, value) ? + SUCCESS : FAILURE; } /* }}} */ ZEND_API int zend_declare_class_constant_null(zend_class_entry *ce, const char *name, size_t name_length TSRMLS_DC) /* {{{ */ { - zval *constant; + zval constant; - if (ce->type & ZEND_INTERNAL_CLASS) { - ALLOC_PERMANENT_ZVAL(constant); - } else { - ALLOC_ZVAL(constant); - } - ZVAL_NULL(constant); - INIT_PZVAL(constant); - return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC); + ZVAL_NULL(&constant); + return zend_declare_class_constant(ce, name, name_length, &constant TSRMLS_CC); } /* }}} */ -ZEND_API int zend_declare_class_constant_long(zend_class_entry *ce, const char *name, size_t name_length, long value TSRMLS_DC) /* {{{ */ +ZEND_API int zend_declare_class_constant_long(zend_class_entry *ce, const char *name, size_t name_length, zend_long value TSRMLS_DC) /* {{{ */ { - zval *constant; + zval constant; - if (ce->type & ZEND_INTERNAL_CLASS) { - ALLOC_PERMANENT_ZVAL(constant); - } else { - ALLOC_ZVAL(constant); - } - ZVAL_LONG(constant, value); - INIT_PZVAL(constant); - return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC); + ZVAL_LONG(&constant, value); + return zend_declare_class_constant(ce, name, name_length, &constant TSRMLS_CC); } /* }}} */ ZEND_API int zend_declare_class_constant_bool(zend_class_entry *ce, const char *name, size_t name_length, zend_bool value TSRMLS_DC) /* {{{ */ { - zval *constant; + zval constant; - if (ce->type & ZEND_INTERNAL_CLASS) { - ALLOC_PERMANENT_ZVAL(constant); - } else { - ALLOC_ZVAL(constant); - } - ZVAL_BOOL(constant, value); - INIT_PZVAL(constant); - return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC); + ZVAL_BOOL(&constant, value); + return zend_declare_class_constant(ce, name, name_length, &constant TSRMLS_CC); } /* }}} */ ZEND_API int zend_declare_class_constant_double(zend_class_entry *ce, const char *name, size_t name_length, double value TSRMLS_DC) /* {{{ */ { - zval *constant; + zval constant; - if (ce->type & ZEND_INTERNAL_CLASS) { - ALLOC_PERMANENT_ZVAL(constant); - } else { - ALLOC_ZVAL(constant); - } - ZVAL_DOUBLE(constant, value); - INIT_PZVAL(constant); - return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC); + ZVAL_DOUBLE(&constant, value); + return zend_declare_class_constant(ce, name, name_length, &constant TSRMLS_CC); } /* }}} */ ZEND_API int zend_declare_class_constant_stringl(zend_class_entry *ce, const char *name, size_t name_length, const char *value, size_t value_length TSRMLS_DC) /* {{{ */ { - zval *constant; + zval constant; - if (ce->type & ZEND_INTERNAL_CLASS) { - ALLOC_PERMANENT_ZVAL(constant); - ZVAL_STRINGL(constant, zend_strndup(value, value_length), value_length, 0); - } else { - ALLOC_ZVAL(constant); - ZVAL_STRINGL(constant, value, value_length, 1); - } - INIT_PZVAL(constant); - return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC); + ZVAL_NEW_STR(&constant, zend_string_init(value, value_length, ce->type & ZEND_INTERNAL_CLASS)); + return zend_declare_class_constant(ce, name, name_length, &constant TSRMLS_CC); } /* }}} */ @@ -3690,22 +3793,16 @@ ZEND_API int zend_declare_class_constant_string(zend_class_entry *ce, const char ZEND_API void zend_update_property(zend_class_entry *scope, zval *object, const char *name, int name_length, zval *value TSRMLS_DC) /* {{{ */ { - zval *property; + zval property; zend_class_entry *old_scope = EG(scope); EG(scope) = scope; if (!Z_OBJ_HT_P(object)->write_property) { - const char *class_name; - zend_uint class_name_len; - - zend_get_object_classname(object, &class_name, &class_name_len TSRMLS_CC); - - zend_error(E_CORE_ERROR, "Property %s of class %s cannot be updated", name, class_name); + zend_error(E_CORE_ERROR, "Property %s of class %s cannot be updated", name, Z_OBJCE_P(object)->name->val); } - MAKE_STD_ZVAL(property); - ZVAL_STRINGL(property, name, name_length, 1); - Z_OBJ_HT_P(object)->write_property(object, property, value, 0 TSRMLS_CC); + ZVAL_STRINGL(&property, name, name_length); + Z_OBJ_HT_P(object)->write_property(object, &property, value, NULL TSRMLS_CC); zval_ptr_dtor(&property); EG(scope) = old_scope; @@ -3714,105 +3811,100 @@ ZEND_API void zend_update_property(zend_class_entry *scope, zval *object, const ZEND_API void zend_update_property_null(zend_class_entry *scope, zval *object, const char *name, int name_length TSRMLS_DC) /* {{{ */ { - zval *tmp; + zval tmp; - ALLOC_ZVAL(tmp); - Z_UNSET_ISREF_P(tmp); - Z_SET_REFCOUNT_P(tmp, 0); - ZVAL_NULL(tmp); - zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC); + ZVAL_NULL(&tmp); + zend_update_property(scope, object, name, name_length, &tmp TSRMLS_CC); } /* }}} */ -ZEND_API void zend_update_property_bool(zend_class_entry *scope, zval *object, const char *name, int name_length, long value TSRMLS_DC) /* {{{ */ +ZEND_API void zend_update_property_bool(zend_class_entry *scope, zval *object, const char *name, int name_length, zend_long value TSRMLS_DC) /* {{{ */ { - zval *tmp; + zval tmp; - ALLOC_ZVAL(tmp); - Z_UNSET_ISREF_P(tmp); - Z_SET_REFCOUNT_P(tmp, 0); - ZVAL_BOOL(tmp, value); - zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC); + ZVAL_BOOL(&tmp, value); + zend_update_property(scope, object, name, name_length, &tmp TSRMLS_CC); } /* }}} */ -ZEND_API void zend_update_property_long(zend_class_entry *scope, zval *object, const char *name, int name_length, long value TSRMLS_DC) /* {{{ */ +ZEND_API void zend_update_property_long(zend_class_entry *scope, zval *object, const char *name, int name_length, zend_long value TSRMLS_DC) /* {{{ */ { - zval *tmp; + zval tmp; - ALLOC_ZVAL(tmp); - Z_UNSET_ISREF_P(tmp); - Z_SET_REFCOUNT_P(tmp, 0); - ZVAL_LONG(tmp, value); - zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC); + ZVAL_LONG(&tmp, value); + zend_update_property(scope, object, name, name_length, &tmp TSRMLS_CC); } /* }}} */ ZEND_API void zend_update_property_double(zend_class_entry *scope, zval *object, const char *name, int name_length, double value TSRMLS_DC) /* {{{ */ { - zval *tmp; + zval tmp; + + ZVAL_DOUBLE(&tmp, value); + zend_update_property(scope, object, name, name_length, &tmp TSRMLS_CC); +} +/* }}} */ + +ZEND_API void zend_update_property_str(zend_class_entry *scope, zval *object, const char *name, int name_length, zend_string *value TSRMLS_DC) /* {{{ */ +{ + zval tmp; - ALLOC_ZVAL(tmp); - Z_UNSET_ISREF_P(tmp); - Z_SET_REFCOUNT_P(tmp, 0); - ZVAL_DOUBLE(tmp, value); - zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC); + ZVAL_STR(&tmp, value); + zend_update_property(scope, object, name, name_length, &tmp TSRMLS_CC); } /* }}} */ ZEND_API void zend_update_property_string(zend_class_entry *scope, zval *object, const char *name, int name_length, const char *value TSRMLS_DC) /* {{{ */ { - zval *tmp; + zval tmp; - ALLOC_ZVAL(tmp); - Z_UNSET_ISREF_P(tmp); - Z_SET_REFCOUNT_P(tmp, 0); - ZVAL_STRING(tmp, value, 1); - zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC); + ZVAL_STRING(&tmp, value); + Z_SET_REFCOUNT(tmp, 0); + zend_update_property(scope, object, name, name_length, &tmp TSRMLS_CC); } /* }}} */ -ZEND_API void zend_update_property_stringl(zend_class_entry *scope, zval *object, const char *name, int name_length, const char *value, int value_len TSRMLS_DC) /* {{{ */ +ZEND_API void zend_update_property_stringl(zend_class_entry *scope, zval *object, const char *name, int name_length, const char *value, size_t value_len TSRMLS_DC) /* {{{ */ { - zval *tmp; + zval tmp; - ALLOC_ZVAL(tmp); - Z_UNSET_ISREF_P(tmp); - Z_SET_REFCOUNT_P(tmp, 0); - ZVAL_STRINGL(tmp, value, value_len, 1); - zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC); + ZVAL_STRINGL(&tmp, value, value_len); + Z_SET_REFCOUNT(tmp, 0); + zend_update_property(scope, object, name, name_length, &tmp TSRMLS_CC); } /* }}} */ ZEND_API int zend_update_static_property(zend_class_entry *scope, const char *name, int name_length, zval *value TSRMLS_DC) /* {{{ */ { - zval **property; + zval *property; zend_class_entry *old_scope = EG(scope); + zend_string *key = zend_string_init(name, name_length, 0); EG(scope) = scope; - property = zend_std_get_static_property(scope, name, name_length, 0, NULL TSRMLS_CC); + property = zend_std_get_static_property(scope, key, 0, NULL TSRMLS_CC); EG(scope) = old_scope; + zend_string_free(key); if (!property) { return FAILURE; } else { - if (*property != value) { - if (PZVAL_IS_REF(*property)) { - zval_dtor(*property); - Z_TYPE_PP(property) = Z_TYPE_P(value); - (*property)->value = value->value; + if (property != value) { + if (Z_ISREF_P(property)) { + zval_dtor(property); + ZVAL_COPY_VALUE(property, value); if (Z_REFCOUNT_P(value) > 0) { - zval_copy_ctor(*property); - } else { - efree(value); + zval_opt_copy_ctor(property); } } else { - zval *garbage = *property; + zval garbage; - Z_ADDREF_P(value); - if (PZVAL_IS_REF(value)) { - SEPARATE_ZVAL(&value); + ZVAL_COPY_VALUE(&garbage, property); + if (Z_REFCOUNTED_P(value)) { + Z_ADDREF_P(value); + if (Z_ISREF_P(value)) { + SEPARATE_ZVAL(value); + } } - *property = value; + ZVAL_COPY_VALUE(property, value); zval_ptr_dtor(&garbage); } } @@ -3823,94 +3915,74 @@ ZEND_API int zend_update_static_property(zend_class_entry *scope, const char *na ZEND_API int zend_update_static_property_null(zend_class_entry *scope, const char *name, int name_length TSRMLS_DC) /* {{{ */ { - zval *tmp; - - ALLOC_ZVAL(tmp); - Z_UNSET_ISREF_P(tmp); - Z_SET_REFCOUNT_P(tmp, 0); - ZVAL_NULL(tmp); - return zend_update_static_property(scope, name, name_length, tmp TSRMLS_CC); + zval tmp; + + ZVAL_NULL(&tmp); + return zend_update_static_property(scope, name, name_length, &tmp TSRMLS_CC); } /* }}} */ -ZEND_API int zend_update_static_property_bool(zend_class_entry *scope, const char *name, int name_length, long value TSRMLS_DC) /* {{{ */ +ZEND_API int zend_update_static_property_bool(zend_class_entry *scope, const char *name, int name_length, zend_long value TSRMLS_DC) /* {{{ */ { - zval *tmp; + zval tmp; - ALLOC_ZVAL(tmp); - Z_UNSET_ISREF_P(tmp); - Z_SET_REFCOUNT_P(tmp, 0); - ZVAL_BOOL(tmp, value); - return zend_update_static_property(scope, name, name_length, tmp TSRMLS_CC); + ZVAL_BOOL(&tmp, value); + return zend_update_static_property(scope, name, name_length, &tmp TSRMLS_CC); } /* }}} */ -ZEND_API int zend_update_static_property_long(zend_class_entry *scope, const char *name, int name_length, long value TSRMLS_DC) /* {{{ */ +ZEND_API int zend_update_static_property_long(zend_class_entry *scope, const char *name, int name_length, zend_long value TSRMLS_DC) /* {{{ */ { - zval *tmp; + zval tmp; - ALLOC_ZVAL(tmp); - Z_UNSET_ISREF_P(tmp); - Z_SET_REFCOUNT_P(tmp, 0); - ZVAL_LONG(tmp, value); - return zend_update_static_property(scope, name, name_length, tmp TSRMLS_CC); + ZVAL_LONG(&tmp, value); + return zend_update_static_property(scope, name, name_length, &tmp TSRMLS_CC); } /* }}} */ ZEND_API int zend_update_static_property_double(zend_class_entry *scope, const char *name, int name_length, double value TSRMLS_DC) /* {{{ */ { - zval *tmp; + zval tmp; - ALLOC_ZVAL(tmp); - Z_UNSET_ISREF_P(tmp); - Z_SET_REFCOUNT_P(tmp, 0); - ZVAL_DOUBLE(tmp, value); - return zend_update_static_property(scope, name, name_length, tmp TSRMLS_CC); + ZVAL_DOUBLE(&tmp, value); + return zend_update_static_property(scope, name, name_length, &tmp TSRMLS_CC); } /* }}} */ ZEND_API int zend_update_static_property_string(zend_class_entry *scope, const char *name, int name_length, const char *value TSRMLS_DC) /* {{{ */ { - zval *tmp; + zval tmp; - ALLOC_ZVAL(tmp); - Z_UNSET_ISREF_P(tmp); - Z_SET_REFCOUNT_P(tmp, 0); - ZVAL_STRING(tmp, value, 1); - return zend_update_static_property(scope, name, name_length, tmp TSRMLS_CC); + ZVAL_STRING(&tmp, value); + Z_SET_REFCOUNT(tmp, 0); + return zend_update_static_property(scope, name, name_length, &tmp TSRMLS_CC); } /* }}} */ -ZEND_API int zend_update_static_property_stringl(zend_class_entry *scope, const char *name, int name_length, const char *value, int value_len TSRMLS_DC) /* {{{ */ +ZEND_API int zend_update_static_property_stringl(zend_class_entry *scope, const char *name, int name_length, const char *value, size_t value_len TSRMLS_DC) /* {{{ */ { - zval *tmp; + zval tmp; - ALLOC_ZVAL(tmp); - Z_UNSET_ISREF_P(tmp); - Z_SET_REFCOUNT_P(tmp, 0); - ZVAL_STRINGL(tmp, value, value_len, 1); - return zend_update_static_property(scope, name, name_length, tmp TSRMLS_CC); + ZVAL_STRINGL(&tmp, value, value_len); + Z_SET_REFCOUNT(tmp, 0); + return zend_update_static_property(scope, name, name_length, &tmp TSRMLS_CC); } /* }}} */ ZEND_API zval *zend_read_property(zend_class_entry *scope, zval *object, const char *name, int name_length, zend_bool silent TSRMLS_DC) /* {{{ */ { - zval *property, *value; + zval property, *value; zend_class_entry *old_scope = EG(scope); + zval rv; EG(scope) = scope; if (!Z_OBJ_HT_P(object)->read_property) { - const char *class_name; - zend_uint class_name_len; - - zend_get_object_classname(object, &class_name, &class_name_len TSRMLS_CC); - zend_error(E_CORE_ERROR, "Property %s of class %s cannot be read", name, class_name); + zend_error(E_CORE_ERROR, "Property %s of class %s cannot be read", name, Z_OBJCE_P(object)->name->val); } - MAKE_STD_ZVAL(property); - ZVAL_STRINGL(property, name, name_length, 1); - value = Z_OBJ_HT_P(object)->read_property(object, property, silent?BP_VAR_IS:BP_VAR_R, 0 TSRMLS_CC); + ZVAL_STRINGL(&property, name, name_length); + value = Z_OBJ_HT_P(object)->read_property(object, &property, silent?BP_VAR_IS:BP_VAR_R, NULL, &rv TSRMLS_CC); zval_ptr_dtor(&property); EG(scope) = old_scope; @@ -3920,14 +3992,16 @@ ZEND_API zval *zend_read_property(zend_class_entry *scope, zval *object, const c ZEND_API zval *zend_read_static_property(zend_class_entry *scope, const char *name, int name_length, zend_bool silent TSRMLS_DC) /* {{{ */ { - zval **property; + zval *property; zend_class_entry *old_scope = EG(scope); + zend_string *key = zend_string_init(name, name_length, 0); EG(scope) = scope; - property = zend_std_get_static_property(scope, name, name_length, silent, NULL TSRMLS_CC); + property = zend_std_get_static_property(scope, key, silent, NULL TSRMLS_CC); EG(scope) = old_scope; + zend_string_free(key); - return property?*property:NULL; + return property; } /* }}} */ @@ -3935,10 +4009,7 @@ ZEND_API void zend_save_error_handling(zend_error_handling *current TSRMLS_DC) / { current->handling = EG(error_handling); current->exception = EG(exception_class); - current->user_handler = EG(user_error_handler); - if (current->user_handler) { - Z_ADDREF_P(current->user_handler); - } + ZVAL_COPY(¤t->user_handler, &EG(user_error_handler)); } /* }}} */ @@ -3946,9 +4017,9 @@ ZEND_API void zend_replace_error_handling(zend_error_handling_t error_handling, { if (current) { zend_save_error_handling(current TSRMLS_CC); - if (error_handling != EH_NORMAL && EG(user_error_handler)) { + if (error_handling != EH_NORMAL && Z_TYPE(EG(user_error_handler)) != IS_UNDEF) { zval_ptr_dtor(&EG(user_error_handler)); - EG(user_error_handler) = NULL; + ZVAL_UNDEF(&EG(user_error_handler)); } } EG(error_handling) = error_handling; @@ -3956,31 +4027,56 @@ ZEND_API void zend_replace_error_handling(zend_error_handling_t error_handling, } /* }}} */ +static int same_zval(zval *zv1, zval *zv2) /* {{{ */ +{ + if (Z_TYPE_P(zv1) != Z_TYPE_P(zv2)) { + return 0; + } + switch (Z_TYPE_P(zv1)) { + case IS_UNDEF: + case IS_NULL: + case IS_FALSE: + case IS_TRUE: + return 1; + case IS_LONG: + return Z_LVAL_P(zv1) == Z_LVAL_P(zv2); + case IS_DOUBLE: + return Z_LVAL_P(zv1) == Z_LVAL_P(zv2); + case IS_STRING: + case IS_ARRAY: + case IS_OBJECT: + case IS_RESOURCE: + return Z_COUNTED_P(zv1) == Z_COUNTED_P(zv2); + default: + return 0; + } +} +/* }}} */ + ZEND_API void zend_restore_error_handling(zend_error_handling *saved TSRMLS_DC) /* {{{ */ { EG(error_handling) = saved->handling; EG(exception_class) = saved->handling == EH_THROW ? saved->exception : NULL; - if (saved->user_handler && saved->user_handler != EG(user_error_handler)) { - if (EG(user_error_handler)) { - zval_ptr_dtor(&EG(user_error_handler)); - } - EG(user_error_handler) = saved->user_handler; - } else if (saved->user_handler) { + if (Z_TYPE(saved->user_handler) != IS_UNDEF + && !same_zval(&saved->user_handler, &EG(user_error_handler))) { + zval_ptr_dtor(&EG(user_error_handler)); + ZVAL_COPY_VALUE(&EG(user_error_handler), &saved->user_handler); + } else if (Z_TYPE(saved->user_handler)) { zval_ptr_dtor(&saved->user_handler); } - saved->user_handler = NULL; + ZVAL_UNDEF(&saved->user_handler); } /* }}} */ -ZEND_API const char* zend_find_alias_name(zend_class_entry *ce, const char *name, zend_uint len) /* {{{ */ +ZEND_API zend_string* zend_find_alias_name(zend_class_entry *ce, zend_string *name) /* {{{ */ { zend_trait_alias *alias, **alias_ptr; if ((alias_ptr = ce->trait_aliases)) { alias = *alias_ptr; while (alias) { - if (alias->alias_len == len && - !strncasecmp(name, alias->alias, alias->alias_len)) { + if (alias->alias->len == name->len && + !strncasecmp(name->val, alias->alias->val, alias->alias->len)) { return alias->alias; } alias_ptr++; @@ -3992,11 +4088,11 @@ ZEND_API const char* zend_find_alias_name(zend_class_entry *ce, const char *name } /* }}} */ -ZEND_API const char* zend_resolve_method_name(zend_class_entry *ce, zend_function *f) /* {{{ */ +ZEND_API zend_string *zend_resolve_method_name(zend_class_entry *ce, zend_function *f) /* {{{ */ { zend_function *func; - HashPosition iterator; HashTable *function_table; + zend_string *name; if (f->common.type != ZEND_USER_FUNCTION || *(f->op_array.refcount) < 2 || @@ -4006,29 +4102,55 @@ ZEND_API const char* zend_resolve_method_name(zend_class_entry *ce, zend_functio } function_table = &ce->function_table; - zend_hash_internal_pointer_reset_ex(function_table, &iterator); - while (zend_hash_get_current_data_ex(function_table, (void **)&func, &iterator) == SUCCESS) { + ZEND_HASH_FOREACH_STR_KEY_PTR(function_table, name, func) { if (func == f) { - char *name; - uint len; - ulong idx; - - if (zend_hash_get_current_key_ex(function_table, &name, &len, &idx, 0, &iterator) != HASH_KEY_IS_STRING) { + if (!name) { return f->common.function_name; } - --len; - if (len == strlen(f->common.function_name) && - !strncasecmp(name, f->common.function_name, len)) { + if (name->len == f->common.function_name->len && + !strncasecmp(name->val, f->common.function_name->val, f->common.function_name->len)) { return f->common.function_name; } - return zend_find_alias_name(f->common.scope, name, len); + return zend_find_alias_name(f->common.scope, name); } - zend_hash_move_forward_ex(function_table, &iterator); - } + } ZEND_HASH_FOREACH_END(); return f->common.function_name; } /* }}} */ +ZEND_API void zend_ctor_make_null(zend_execute_data *execute_data) /* {{{ */ +{ + if (EX(return_value)) { +/* + if (Z_TYPE_P(EX(return_value)) == IS_OBJECT) { + zend_object *object = Z_OBJ_P(EX(return_value)); + zend_execute_data *ex = EX(prev_execute_data); + + while (ex && Z_OBJ(ex->This) == object) { + if (ex->func) { + if (ZEND_USER_CODE(ex->func->type)) { + if (ex->func->op_array.this_var != -1) { + zval *this_var = EX_VAR_2(ex, ex->func->op_array.this_var); + if (this_var != EX(return_value)) { + zval_ptr_dtor(this_var); + ZVAL_NULL(this_var); + } + } + } + } + Z_OBJ(ex->This) = NULL; + ZVAL_NULL(&ex->This); + ex = ex->prev_execute_data; + } + } +*/ + zval_ptr_dtor(EX(return_value)); + Z_OBJ_P(EX(return_value)) = NULL; + ZVAL_NULL(EX(return_value)); + } +} +/* }}} */ + /* * Local variables: * tab-width: 4 |