diff options
| author | Máté Kocsis <kocsismate@woohoolabs.com> | 2019-12-31 16:33:02 +0100 |
|---|---|---|
| committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2019-12-31 16:33:02 +0100 |
| commit | 817605917bae487ffbdc03226ec8f536b6d1bc66 (patch) | |
| tree | c034ea4f126aa3caa89fdc47fc48dc692e4ed84a | |
| parent | 062744fbdf04c06c6cce090927d4e91b841cfb6f (diff) | |
| download | php-git-817605917bae487ffbdc03226ec8f536b6d1bc66.tar.gz | |
Use RETURN_THROWS() during ZPP in the remaining extensions
In reflection, sodium, and SPL
| -rw-r--r-- | ext/reflection/php_reflection.c | 334 | ||||
| -rw-r--r-- | ext/sodium/libsodium.c | 168 | ||||
| -rw-r--r-- | ext/spl/php_spl.c | 22 | ||||
| -rw-r--r-- | ext/spl/spl_array.c | 48 | ||||
| -rw-r--r-- | ext/spl/spl_directory.c | 108 | ||||
| -rw-r--r-- | ext/spl/spl_dllist.c | 50 | ||||
| -rw-r--r-- | ext/spl/spl_fixedarray.c | 32 | ||||
| -rw-r--r-- | ext/spl/spl_heap.c | 42 | ||||
| -rw-r--r-- | ext/spl/spl_iterators.c | 164 | ||||
| -rw-r--r-- | ext/spl/spl_observer.c | 58 |
10 files changed, 513 insertions, 513 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 6c04c47ea0..957a866177 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -1058,7 +1058,7 @@ static void _function_check_flag(INTERNAL_FUNCTION_PARAMETERS, int mask) zend_function *mptr; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(mptr); RETURN_BOOL(mptr->common.fn_flags & mask); @@ -1314,13 +1314,13 @@ static void _reflection_export(INTERNAL_FUNCTION_PARAMETERS, zend_class_entry *c if (ctor_argc == 1) { if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|b", &argument_ptr, &return_output) == FAILURE) { - return; + RETURN_THROWS(); } ZVAL_COPY_VALUE(¶ms[0], argument_ptr); ZVAL_NULL(¶ms[1]); } else { if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz|b", &argument_ptr, &argument2_ptr, &return_output) == FAILURE) { - return; + RETURN_THROWS(); } ZVAL_COPY_VALUE(¶ms[0], argument_ptr); ZVAL_COPY_VALUE(¶ms[1], argument2_ptr); @@ -1443,7 +1443,7 @@ ZEND_METHOD(reflection, getModifierNames) zend_long modifiers; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &modifiers) == FAILURE) { - return; + RETURN_THROWS(); } array_init(return_value); @@ -1502,7 +1502,7 @@ ZEND_METHOD(reflection_function, __construct) ALLOCA_FLAG(use_heap) if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &fname) == FAILURE) { - return; + RETURN_THROWS(); } if (UNEXPECTED(ZSTR_VAL(fname)[0] == '\\')) { @@ -1545,7 +1545,7 @@ ZEND_METHOD(reflection_function, __toString) smart_str str = {0}; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(fptr); _function_string(&str, fptr, intern->ce, ""); @@ -1558,7 +1558,7 @@ ZEND_METHOD(reflection_function, __toString) ZEND_METHOD(reflection_function, getName) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } _default_get_name(ZEND_THIS, return_value); } @@ -1572,7 +1572,7 @@ ZEND_METHOD(reflection_function, isClosure) zend_function *fptr; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(fptr); RETURN_BOOL(fptr->common.fn_flags & ZEND_ACC_CLOSURE); @@ -1587,7 +1587,7 @@ ZEND_METHOD(reflection_function, getClosureThis) zval* closure_this; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT(); if (!Z_ISUNDEF(intern->obj)) { @@ -1608,7 +1608,7 @@ ZEND_METHOD(reflection_function, getClosureScopeClass) const zend_function *closure_func; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT(); if (!Z_ISUNDEF(intern->obj)) { @@ -1628,7 +1628,7 @@ ZEND_METHOD(reflection_function, getClosure) zend_function *fptr; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(fptr); @@ -1650,7 +1650,7 @@ ZEND_METHOD(reflection_function, isInternal) zend_function *fptr; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(fptr); RETURN_BOOL(fptr->type == ZEND_INTERNAL_FUNCTION); @@ -1665,7 +1665,7 @@ ZEND_METHOD(reflection_function, isUserDefined) zend_function *fptr; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(fptr); RETURN_BOOL(fptr->type == ZEND_USER_FUNCTION); @@ -1682,7 +1682,7 @@ ZEND_METHOD(reflection_function, isDisabled) GET_REFLECTION_OBJECT_PTR(fptr); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_BOOL(fptr->type == ZEND_INTERNAL_FUNCTION && fptr->internal_function.handler == zif_display_disabled_function); @@ -1697,7 +1697,7 @@ ZEND_METHOD(reflection_function, getFileName) zend_function *fptr; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(fptr); if (fptr->type == ZEND_USER_FUNCTION) { @@ -1715,7 +1715,7 @@ ZEND_METHOD(reflection_function, getStartLine) zend_function *fptr; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(fptr); if (fptr->type == ZEND_USER_FUNCTION) { @@ -1733,7 +1733,7 @@ ZEND_METHOD(reflection_function, getEndLine) zend_function *fptr; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(fptr); if (fptr->type == ZEND_USER_FUNCTION) { @@ -1751,7 +1751,7 @@ ZEND_METHOD(reflection_function, getDocComment) zend_function *fptr; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(fptr); if (fptr->type == ZEND_USER_FUNCTION && fptr->op_array.doc_comment) { @@ -1770,7 +1770,7 @@ ZEND_METHOD(reflection_function, getStaticVariables) zval *val; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(fptr); @@ -1812,7 +1812,7 @@ ZEND_METHOD(reflection_function, invoke) GET_REFLECTION_OBJECT_PTR(fptr); if (zend_parse_parameters(ZEND_NUM_ARGS(), "*", ¶ms, &num_args) == FAILURE) { - return; + RETURN_THROWS(); } fci.size = sizeof(fci); @@ -1866,7 +1866,7 @@ ZEND_METHOD(reflection_function, invokeArgs) GET_REFLECTION_OBJECT_PTR(fptr); if (zend_parse_parameters(ZEND_NUM_ARGS(), "a", ¶m_array) == FAILURE) { - return; + RETURN_THROWS(); } argc = zend_hash_num_elements(Z_ARRVAL_P(param_array)); @@ -1927,7 +1927,7 @@ ZEND_METHOD(reflection_function, returnsReference) GET_REFLECTION_OBJECT_PTR(fptr); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_BOOL((fptr->op_array.fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0); @@ -1945,7 +1945,7 @@ ZEND_METHOD(reflection_function, getNumberOfParameters) GET_REFLECTION_OBJECT_PTR(fptr); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } num_args = fptr->common.num_args; @@ -1967,7 +1967,7 @@ ZEND_METHOD(reflection_function, getNumberOfRequiredParameters) GET_REFLECTION_OBJECT_PTR(fptr); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(fptr->common.required_num_args); @@ -1986,7 +1986,7 @@ ZEND_METHOD(reflection_function, getParameters) GET_REFLECTION_OBJECT_PTR(fptr); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } arg_info= fptr->common.arg_info; @@ -2029,7 +2029,7 @@ ZEND_METHOD(reflection_function, getExtension) GET_REFLECTION_OBJECT_PTR(fptr); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (fptr->type != ZEND_INTERNAL_FUNCTION) { @@ -2056,7 +2056,7 @@ ZEND_METHOD(reflection_function, getExtensionName) GET_REFLECTION_OBJECT_PTR(fptr); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (fptr->type != ZEND_INTERNAL_FUNCTION) { @@ -2083,7 +2083,7 @@ ZEND_METHOD(reflection_generator, __construct) intern = Z_REFLECTION_P(object); if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &generator, zend_ce_generator) == FAILURE) { - return; + RETURN_THROWS(); } ex = ((zend_generator *) Z_OBJ_P(generator))->execute_data; @@ -2116,7 +2116,7 @@ ZEND_METHOD(reflection_generator, getTrace) zend_execute_data *root_prev = NULL, *cur_prev; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &options) == FAILURE) { - return; + RETURN_THROWS(); } REFLECTION_CHECK_VALID_GENERATOR(ex) @@ -2148,7 +2148,7 @@ ZEND_METHOD(reflection_generator, getExecutingLine) zend_execute_data *ex = generator->execute_data; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } REFLECTION_CHECK_VALID_GENERATOR(ex) @@ -2164,7 +2164,7 @@ ZEND_METHOD(reflection_generator, getExecutingFile) zend_execute_data *ex = generator->execute_data; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } REFLECTION_CHECK_VALID_GENERATOR(ex) @@ -2180,7 +2180,7 @@ ZEND_METHOD(reflection_generator, getFunction) zend_execute_data *ex = generator->execute_data; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } REFLECTION_CHECK_VALID_GENERATOR(ex) @@ -2204,7 +2204,7 @@ ZEND_METHOD(reflection_generator, getThis) zend_execute_data *ex = generator->execute_data; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } REFLECTION_CHECK_VALID_GENERATOR(ex) @@ -2226,7 +2226,7 @@ ZEND_METHOD(reflection_generator, getExecutingGenerator) zend_generator *current; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } REFLECTION_CHECK_VALID_GENERATOR(ex) @@ -2263,7 +2263,7 @@ ZEND_METHOD(reflection_parameter, __construct) zend_bool is_closure = 0; if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &reference, ¶meter) == FAILURE) { - return; + RETURN_THROWS(); } object = ZEND_THIS; @@ -2449,7 +2449,7 @@ ZEND_METHOD(reflection_parameter, __toString) smart_str str = {0}; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); _parameter_string(&str, param->fptr, param->arg_info, param->offset, param->required, ""); @@ -2463,7 +2463,7 @@ ZEND_METHOD(reflection_parameter, __toString) ZEND_METHOD(reflection_parameter, getName) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } _default_get_name(ZEND_THIS, return_value); } @@ -2477,7 +2477,7 @@ ZEND_METHOD(reflection_parameter, getDeclaringFunction) parameter_reference *param; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -2497,7 +2497,7 @@ ZEND_METHOD(reflection_parameter, getDeclaringClass) parameter_reference *param; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -2516,7 +2516,7 @@ ZEND_METHOD(reflection_parameter, getClass) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -2578,7 +2578,7 @@ ZEND_METHOD(reflection_parameter, hasType) parameter_reference *param; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -2594,7 +2594,7 @@ ZEND_METHOD(reflection_parameter, getType) parameter_reference *param; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -2614,7 +2614,7 @@ ZEND_METHOD(reflection_parameter, isArray) uint32_t type_mask; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -2632,7 +2632,7 @@ ZEND_METHOD(reflection_parameter, isCallable) uint32_t type_mask; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -2649,7 +2649,7 @@ ZEND_METHOD(reflection_parameter, allowsNull) parameter_reference *param; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -2666,7 +2666,7 @@ ZEND_METHOD(reflection_parameter, isPassedByReference) parameter_reference *param; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -2682,7 +2682,7 @@ ZEND_METHOD(reflection_parameter, canBePassedByValue) parameter_reference *param; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -2699,7 +2699,7 @@ ZEND_METHOD(reflection_parameter, getPosition) parameter_reference *param; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -2715,7 +2715,7 @@ ZEND_METHOD(reflection_parameter, isOptional) parameter_reference *param; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -2732,7 +2732,7 @@ ZEND_METHOD(reflection_parameter, isDefaultValueAvailable) zend_op *precv; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -2757,7 +2757,7 @@ ZEND_METHOD(reflection_parameter, getDefaultValue) zend_op *precv; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } param = _reflection_param_get_default_param(INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -2785,7 +2785,7 @@ ZEND_METHOD(reflection_parameter, isDefaultValueConstant) parameter_reference *param; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } param = _reflection_param_get_default_param(INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -2815,7 +2815,7 @@ ZEND_METHOD(reflection_parameter, getDefaultValueConstantName) parameter_reference *param; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } param = _reflection_param_get_default_param(INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -2844,7 +2844,7 @@ ZEND_METHOD(reflection_parameter, isVariadic) parameter_reference *param; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -2860,7 +2860,7 @@ ZEND_METHOD(reflection_type, allowsNull) type_reference *param; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -2881,7 +2881,7 @@ ZEND_METHOD(reflection_type, __toString) type_reference *param; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -2897,7 +2897,7 @@ ZEND_METHOD(reflection_named_type, getName) type_reference *param; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -2916,7 +2916,7 @@ ZEND_METHOD(reflection_named_type, isBuiltin) type_reference *param; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -2943,7 +2943,7 @@ ZEND_METHOD(reflection_union_type, getTypes) uint32_t type_mask; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(param); @@ -3025,7 +3025,7 @@ ZEND_METHOD(reflection_method, __construct) if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "zs", &classname, &name_str, &name_len) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name_str, &name_len) == FAILURE) { - return; + RETURN_THROWS(); } if ((tmp = strstr(name_str, "::")) == NULL) { @@ -3111,7 +3111,7 @@ ZEND_METHOD(reflection_method, __toString) smart_str str = {0}; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(mptr); _function_string(&str, mptr, intern->ce, ""); @@ -3133,7 +3133,7 @@ ZEND_METHOD(reflection_method, getClosure) zend_create_fake_closure(return_value, mptr, mptr->common.scope, mptr->common.scope, NULL); } else { if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &obj) == FAILURE) { - return; + RETURN_THROWS(); } if (!instanceof_function(Z_OBJCE_P(obj), mptr->common.scope)) { @@ -3187,11 +3187,11 @@ static void reflection_method_invoke(INTERNAL_FUNCTION_PARAMETERS, int variadic) if (variadic) { if (zend_parse_parameters(ZEND_NUM_ARGS(), "o!*", &object, ¶ms, &argc) == FAILURE) { - return; + RETURN_THROWS(); } } else { if (zend_parse_parameters(ZEND_NUM_ARGS(), "o!a", &object, ¶m_array) == FAILURE) { - return; + RETURN_THROWS(); } argc = zend_hash_num_elements(Z_ARRVAL_P(param_array)); @@ -3371,7 +3371,7 @@ ZEND_METHOD(reflection_function, inNamespace) const char *backslash; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if ((name = _default_load_name(ZEND_THIS)) == NULL) { RETURN_FALSE; @@ -3394,7 +3394,7 @@ ZEND_METHOD(reflection_function, getNamespaceName) const char *backslash; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if ((name = _default_load_name(ZEND_THIS)) == NULL) { RETURN_FALSE; @@ -3417,7 +3417,7 @@ ZEND_METHOD(reflection_function, getShortName) const char *backslash; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if ((name = _default_load_name(ZEND_THIS)) == NULL) { RETURN_FALSE; @@ -3440,7 +3440,7 @@ ZEND_METHOD(reflection_function, hasReturnType) zend_function *fptr; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(fptr); @@ -3457,7 +3457,7 @@ ZEND_METHOD(reflection_function, getReturnType) zend_function *fptr; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(fptr); @@ -3478,7 +3478,7 @@ ZEND_METHOD(reflection_method, isConstructor) zend_function *mptr; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(mptr); /* we need to check if the ctor is the ctor of the class level we we @@ -3496,7 +3496,7 @@ ZEND_METHOD(reflection_method, isDestructor) zend_function *mptr; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(mptr); RETURN_BOOL(mptr->common.fn_flags & ZEND_ACC_DTOR); @@ -3513,7 +3513,7 @@ ZEND_METHOD(reflection_method, getModifiers) | ZEND_ACC_STATIC | ZEND_ACC_ABSTRACT | ZEND_ACC_FINAL; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(mptr); @@ -3531,7 +3531,7 @@ ZEND_METHOD(reflection_method, getDeclaringClass) GET_REFLECTION_OBJECT_PTR(mptr); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } zend_reflection_class_factory(mptr->common.scope, return_value); @@ -3548,7 +3548,7 @@ ZEND_METHOD(reflection_method, getPrototype) GET_REFLECTION_OBJECT_PTR(mptr); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (!mptr->common.prototype) { @@ -3569,7 +3569,7 @@ ZEND_METHOD(reflection_method, setAccessible) zend_bool visible; if (zend_parse_parameters(ZEND_NUM_ARGS(), "b", &visible) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_REFLECTION_P(ZEND_THIS); @@ -3589,7 +3589,7 @@ ZEND_METHOD(reflection_class_constant, __construct) zend_class_constant *constant = NULL; if (zend_parse_parameters(ZEND_NUM_ARGS(), "zS", &classname, &constname) == FAILURE) { - return; + RETURN_THROWS(); } object = ZEND_THIS; @@ -3638,7 +3638,7 @@ ZEND_METHOD(reflection_class_constant, __toString) zval name; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ref); _default_get_name(ZEND_THIS, &name); @@ -3653,7 +3653,7 @@ ZEND_METHOD(reflection_class_constant, __toString) ZEND_METHOD(reflection_class_constant, getName) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } _default_get_name(ZEND_THIS, return_value); } @@ -3665,7 +3665,7 @@ static void _class_constant_check_flag(INTERNAL_FUNCTION_PARAMETERS, int mask) / zend_class_constant *ref; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ref); RETURN_BOOL(Z_ACCESS_FLAGS(ref->value) & mask); @@ -3704,7 +3704,7 @@ ZEND_METHOD(reflection_class_constant, getModifiers) zend_class_constant *ref; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ref); @@ -3720,7 +3720,7 @@ ZEND_METHOD(reflection_class_constant, getValue) zend_class_constant *ref; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ref); @@ -3739,7 +3739,7 @@ ZEND_METHOD(reflection_class_constant, getDeclaringClass) zend_class_constant *ref; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ref); @@ -3755,7 +3755,7 @@ ZEND_METHOD(reflection_class_constant, getDocComment) zend_class_constant *ref; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ref); if (ref->doc_comment) { @@ -3877,7 +3877,7 @@ ZEND_METHOD(reflection_class, getStaticProperties) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -3901,7 +3901,7 @@ ZEND_METHOD(reflection_class, getStaticPropertyValue) zval *prop, *def_value = NULL; if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|z", &name, &def_value) == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -3935,7 +3935,7 @@ ZEND_METHOD(reflection_class, setStaticPropertyValue) zval *variable_ptr, *value; if (zend_parse_parameters(ZEND_NUM_ARGS(), "Sz", &name, &value) == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -3978,7 +3978,7 @@ ZEND_METHOD(reflection_class, getDefaultProperties) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); array_init(return_value); @@ -3999,7 +3999,7 @@ ZEND_METHOD(reflection_class, __toString) smart_str str = {0}; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); _class_string(&str, ce, &intern->obj, ""); @@ -4012,7 +4012,7 @@ ZEND_METHOD(reflection_class, __toString) ZEND_METHOD(reflection_class, getName) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } _default_get_name(ZEND_THIS, return_value); } @@ -4026,7 +4026,7 @@ ZEND_METHOD(reflection_class, isInternal) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); RETURN_BOOL(ce->type == ZEND_INTERNAL_CLASS); @@ -4041,7 +4041,7 @@ ZEND_METHOD(reflection_class, isUserDefined) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); RETURN_BOOL(ce->type == ZEND_USER_CLASS); @@ -4056,7 +4056,7 @@ ZEND_METHOD(reflection_class, isAnonymous) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); RETURN_BOOL(ce->ce_flags & ZEND_ACC_ANON_CLASS); @@ -4071,7 +4071,7 @@ ZEND_METHOD(reflection_class, getFileName) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); if (ce->type == ZEND_USER_CLASS) { @@ -4089,7 +4089,7 @@ ZEND_METHOD(reflection_class, getStartLine) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); if (ce->type == ZEND_USER_CLASS) { @@ -4107,7 +4107,7 @@ ZEND_METHOD(reflection_class, getEndLine) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); if (ce->type == ZEND_USER_CLASS) { @@ -4125,7 +4125,7 @@ ZEND_METHOD(reflection_class, getDocComment) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); if (ce->type == ZEND_USER_CLASS && ce->info.user.doc_comment) { @@ -4143,7 +4143,7 @@ ZEND_METHOD(reflection_class, getConstructor) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -4164,7 +4164,7 @@ ZEND_METHOD(reflection_class, hasMethod) zend_string *name, *lc_name; if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &name) == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -4185,7 +4185,7 @@ ZEND_METHOD(reflection_class, getMethod) zend_string *name, *lc_name; if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &name) == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -4234,7 +4234,7 @@ ZEND_METHOD(reflection_class, getMethods) zend_bool filter_is_null = 1; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l!", &filter, &filter_is_null) == FAILURE) { - return; + RETURN_THROWS(); } if (filter_is_null) { @@ -4279,7 +4279,7 @@ ZEND_METHOD(reflection_class, hasProperty) zend_string *name; if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &name) == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -4311,7 +4311,7 @@ ZEND_METHOD(reflection_class, getProperty) size_t classname_len, str_name_len; if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &name) == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -4414,9 +4414,9 @@ ZEND_METHOD(reflection_class, getProperties) zend_bool filter_is_null = 1; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l!", &filter, &filter_is_null) == FAILURE) { - return; + RETURN_THROWS(); } - + if (filter_is_null) { filter = ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC; } @@ -4447,7 +4447,7 @@ ZEND_METHOD(reflection_class, hasConstant) zend_string *name; if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &name) == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -4470,7 +4470,7 @@ ZEND_METHOD(reflection_class, getConstants) zval val; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); array_init(return_value); @@ -4495,7 +4495,7 @@ ZEND_METHOD(reflection_class, getReflectionConstants) zend_class_constant *constant; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); array_init(return_value); @@ -4517,7 +4517,7 @@ ZEND_METHOD(reflection_class, getConstant) zend_string *name; if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &name) == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -4544,7 +4544,7 @@ ZEND_METHOD(reflection_class, getReflectionConstant) GET_REFLECTION_OBJECT_PTR(ce); if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &name) == FAILURE) { - return; + RETURN_THROWS(); } if ((constant = zend_hash_find_ptr(&ce->constants_table, name)) == NULL) { @@ -4561,7 +4561,7 @@ static void _class_check_flag(INTERNAL_FUNCTION_PARAMETERS, int mask) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); RETVAL_BOOL(ce->ce_flags & mask); @@ -4576,7 +4576,7 @@ ZEND_METHOD(reflection_class, isInstantiable) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); if (ce->ce_flags & (ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS)) { @@ -4602,7 +4602,7 @@ ZEND_METHOD(reflection_class, isCloneable) zval obj; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); if (ce->ce_flags & (ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS)) { @@ -4670,7 +4670,7 @@ ZEND_METHOD(reflection_class, getModifiers) | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -4687,7 +4687,7 @@ ZEND_METHOD(reflection_class, isInstance) zval *object; if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &object) == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); RETURN_BOOL(instanceof_function(Z_OBJCE_P(object), ce)); @@ -4729,7 +4729,7 @@ ZEND_METHOD(reflection_class, newInstance) if (zend_parse_parameters(ZEND_NUM_ARGS(), "*", ¶ms, &num_args) == FAILURE) { zval_ptr_dtor(return_value); - RETURN_FALSE; + RETURN_THROWS(); } for (i = 0; i < num_args; i++) { @@ -4778,7 +4778,7 @@ ZEND_METHOD(reflection_class, newInstanceWithoutConstructor) GET_REFLECTION_OBJECT_PTR(ce); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (ce->type == ZEND_INTERNAL_CLASS @@ -4805,7 +4805,7 @@ ZEND_METHOD(reflection_class, newInstanceArgs) GET_REFLECTION_OBJECT_PTR(ce); if (zend_parse_parameters(ZEND_NUM_ARGS(), "|h", &args) == FAILURE) { - return; + RETURN_THROWS(); } if (ZEND_NUM_ARGS() > 0) { @@ -4886,7 +4886,7 @@ ZEND_METHOD(reflection_class, getInterfaces) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -4915,7 +4915,7 @@ ZEND_METHOD(reflection_class, getInterfaceNames) uint32_t i; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -4942,7 +4942,7 @@ ZEND_METHOD(reflection_class, getTraits) uint32_t i; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -4974,7 +4974,7 @@ ZEND_METHOD(reflection_class, getTraitNames) uint32_t i; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -4998,7 +4998,7 @@ ZEND_METHOD(reflection_class, getTraitAliases) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -5033,7 +5033,7 @@ ZEND_METHOD(reflection_class, getParentClass) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -5056,7 +5056,7 @@ ZEND_METHOD(reflection_class, isSubclassOf) GET_REFLECTION_OBJECT_PTR(ce); if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &class_name) == FAILURE) { - return; + RETURN_THROWS(); } switch (Z_TYPE_P(class_name)) { @@ -5099,7 +5099,7 @@ ZEND_METHOD(reflection_class, implementsInterface) GET_REFLECTION_OBJECT_PTR(ce); if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &interface) == FAILURE) { - return; + RETURN_THROWS(); } switch (Z_TYPE_P(interface)) { @@ -5144,7 +5144,7 @@ ZEND_METHOD(reflection_class, isIterable) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -5166,7 +5166,7 @@ ZEND_METHOD(reflection_class, getExtension) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ce); @@ -5206,7 +5206,7 @@ ZEND_METHOD(reflection_class, inNamespace) const char *backslash; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if ((name = _default_load_name(ZEND_THIS)) == NULL) { RETURN_FALSE; @@ -5229,7 +5229,7 @@ ZEND_METHOD(reflection_class, getNamespaceName) const char *backslash; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if ((name = _default_load_name(ZEND_THIS)) == NULL) { RETURN_FALSE; @@ -5252,7 +5252,7 @@ ZEND_METHOD(reflection_class, getShortName) const char *backslash; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if ((name = _default_load_name(ZEND_THIS)) == NULL) { RETURN_FALSE; @@ -5313,7 +5313,7 @@ ZEND_METHOD(reflection_property, __construct) property_reference *reference; if (zend_parse_parameters(ZEND_NUM_ARGS(), "zS", &classname, &name) == FAILURE) { - return; + RETURN_THROWS(); } object = ZEND_THIS; @@ -5380,7 +5380,7 @@ ZEND_METHOD(reflection_property, __toString) smart_str str = {0}; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ref); _property_string(&str, ref->prop, ZSTR_VAL(ref->unmangled_name), ""); @@ -5393,7 +5393,7 @@ ZEND_METHOD(reflection_property, __toString) ZEND_METHOD(reflection_property, getName) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } _default_get_name(ZEND_THIS, return_value); } @@ -5405,7 +5405,7 @@ static void _property_check_flag(INTERNAL_FUNCTION_PARAMETERS, int mask) /* {{{ property_reference *ref; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ref); RETURN_BOOL(prop_get_flags(ref) & mask); @@ -5452,7 +5452,7 @@ ZEND_METHOD(reflection_property, isDefault) property_reference *ref; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ref); RETURN_BOOL(ref->prop != NULL); @@ -5468,7 +5468,7 @@ ZEND_METHOD(reflection_property, getModifiers) uint32_t keep_flags = ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ref); @@ -5503,7 +5503,7 @@ ZEND_METHOD(reflection_property, getValue) zval rv; if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &object) == FAILURE) { - return; + RETURN_THROWS(); } /* TODO: Should this always use intern->ce? */ @@ -5547,14 +5547,14 @@ ZEND_METHOD(reflection_property, setValue) if (prop_get_flags(ref) & ZEND_ACC_STATIC) { if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "z", &value) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &tmp, &value) == FAILURE) { - return; + RETURN_THROWS(); } } zend_update_static_property_ex(intern->ce, ref->unmangled_name, value); } else { if (zend_parse_parameters(ZEND_NUM_ARGS(), "oz", &object, &value) == FAILURE) { - return; + RETURN_THROWS(); } zend_update_property_ex(intern->ce, object, ref->unmangled_name, value); @@ -5591,7 +5591,7 @@ ZEND_METHOD(reflection_property, isInitialized) int retval; if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &object) == FAILURE) { - return; + RETURN_THROWS(); } /* TODO: Should this always use intern->ce? */ @@ -5620,7 +5620,7 @@ ZEND_METHOD(reflection_property, getDeclaringClass) zend_property_info *tmp_info; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ref); @@ -5650,7 +5650,7 @@ ZEND_METHOD(reflection_property, getDocComment) property_reference *ref; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ref); if (ref->prop && ref->prop->doc_comment) { @@ -5668,7 +5668,7 @@ ZEND_METHOD(reflection_property, setAccessible) zend_bool visible; if (zend_parse_parameters(ZEND_NUM_ARGS(), "b", &visible) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_REFLECTION_P(ZEND_THIS); @@ -5685,7 +5685,7 @@ ZEND_METHOD(reflection_property, getType) property_reference *ref; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ref); @@ -5706,7 +5706,7 @@ ZEND_METHOD(reflection_property, hasType) property_reference *ref; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(ref); @@ -5736,7 +5736,7 @@ ZEND_METHOD(reflection_extension, __construct) ALLOCA_FLAG(use_heap) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name_str, &name_len) == FAILURE) { - return; + RETURN_THROWS(); } object = ZEND_THIS; @@ -5766,7 +5766,7 @@ ZEND_METHOD(reflection_extension, __toString) smart_str str = {0}; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(module); _extension_string(&str, module, ""); @@ -5779,7 +5779,7 @@ ZEND_METHOD(reflection_extension, __toString) ZEND_METHOD(reflection_extension, getName) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } _default_get_name(ZEND_THIS, return_value); } @@ -5793,7 +5793,7 @@ ZEND_METHOD(reflection_extension, getVersion) zend_module_entry *module; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(module); @@ -5816,7 +5816,7 @@ ZEND_METHOD(reflection_extension, getFunctions) zend_function *fptr; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(module); @@ -5840,7 +5840,7 @@ ZEND_METHOD(reflection_extension, getConstants) zend_constant *constant; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(module); @@ -5879,7 +5879,7 @@ ZEND_METHOD(reflection_extension, getINIEntries) zend_ini_entry *ini_entry; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(module); @@ -5924,7 +5924,7 @@ ZEND_METHOD(reflection_extension, getClasses) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(module); @@ -5945,7 +5945,7 @@ ZEND_METHOD(reflection_extension, getClassNames) zend_class_entry *ce; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(module); @@ -5965,7 +5965,7 @@ ZEND_METHOD(reflection_extension, getDependencies) const zend_module_dep *dep; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(module); @@ -6030,7 +6030,7 @@ ZEND_METHOD(reflection_extension, info) zend_module_entry *module; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(module); @@ -6046,7 +6046,7 @@ ZEND_METHOD(reflection_extension, isPersistent) zend_module_entry *module; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(module); @@ -6062,7 +6062,7 @@ ZEND_METHOD(reflection_extension, isTemporary) zend_module_entry *module; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(module); @@ -6089,7 +6089,7 @@ ZEND_METHOD(reflection_zend_extension, __construct) size_t name_len; if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name_str, &name_len) == FAILURE) { - return; + RETURN_THROWS(); } object = ZEND_THIS; @@ -6117,7 +6117,7 @@ ZEND_METHOD(reflection_zend_extension, __toString) smart_str str = {0}; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(extension); _zend_extension_string(&str, extension, ""); @@ -6133,7 +6133,7 @@ ZEND_METHOD(reflection_zend_extension, getName) zend_extension *extension; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(extension); @@ -6149,7 +6149,7 @@ ZEND_METHOD(reflection_zend_extension, getVersion) zend_extension *extension; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(extension); @@ -6169,7 +6169,7 @@ ZEND_METHOD(reflection_zend_extension, getAuthor) zend_extension *extension; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(extension); @@ -6189,7 +6189,7 @@ ZEND_METHOD(reflection_zend_extension, getURL) zend_extension *extension; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(extension); @@ -6209,7 +6209,7 @@ ZEND_METHOD(reflection_zend_extension, getCopyright) zend_extension *extension; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } GET_REFLECTION_OBJECT_PTR(extension); @@ -6251,7 +6251,7 @@ ZEND_METHOD(reflection_reference, fromArrayElement) reflection_object *intern; if (zend_parse_parameters(ZEND_NUM_ARGS(), "hz", &ht, &key) == FAILURE) { - return; + RETURN_THROWS(); } if (Z_TYPE_P(key) == IS_LONG) { @@ -6289,7 +6289,7 @@ ZEND_METHOD(reflection_reference, getId) PHP_SHA1_CTX context; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_REFLECTION_P(getThis()); diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c index bbb4930b50..0e7452d0b2 100644 --- a/ext/sodium/libsodium.c +++ b/ext/sodium/libsodium.c @@ -495,7 +495,7 @@ PHP_FUNCTION(sodium_memzero) if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &buf_zv) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } ZVAL_DEREF(buf_zv); if (Z_TYPE_P(buf_zv) != IS_STRING) { @@ -521,7 +521,7 @@ PHP_FUNCTION(sodium_increment) if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val_zv) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } ZVAL_DEREF(val_zv); if (Z_TYPE_P(val_zv) != IS_STRING) { @@ -546,7 +546,7 @@ PHP_FUNCTION(sodium_add) if (zend_parse_parameters(ZEND_NUM_ARGS(), "zs", &val_zv, &addv, &addv_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } ZVAL_DEREF(val_zv); if (Z_TYPE_P(val_zv) != IS_STRING) { @@ -575,7 +575,7 @@ PHP_FUNCTION(sodium_memcmp) &buf1, &len1, &buf2, &len2) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (len1 != len2) { zend_throw_exception(sodium_exception_ce, "arguments have different sizes", 0); @@ -596,7 +596,7 @@ PHP_FUNCTION(sodium_crypto_shorthash) &msg, &msg_len, &key, &key_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (key_len != crypto_shorthash_KEYBYTES) { zend_throw_exception(sodium_exception_ce, @@ -631,7 +631,7 @@ PHP_FUNCTION(sodium_crypto_secretbox) &nonce, &nonce_len, &key, &key_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (nonce_len != crypto_secretbox_NONCEBYTES) { zend_throw_exception(sodium_exception_ce, @@ -677,7 +677,7 @@ PHP_FUNCTION(sodium_crypto_secretbox_open) &nonce, &nonce_len, &key, &key_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (nonce_len != crypto_secretbox_NONCEBYTES) { zend_throw_exception(sodium_exception_ce, @@ -721,7 +721,7 @@ PHP_FUNCTION(sodium_crypto_generichash) &key, &key_len, &hash_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (hash_len < crypto_generichash_BYTES_MIN || hash_len > crypto_generichash_BYTES_MAX) { @@ -760,7 +760,7 @@ PHP_FUNCTION(sodium_crypto_generichash_init) &key, &key_len, &hash_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (hash_len < crypto_generichash_BYTES_MIN || hash_len > crypto_generichash_BYTES_MAX) { @@ -799,7 +799,7 @@ PHP_FUNCTION(sodium_crypto_generichash_update) if (zend_parse_parameters(ZEND_NUM_ARGS(), "zs", &state_zv, &msg, &msg_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } ZVAL_DEREF(state_zv); if (Z_TYPE_P(state_zv) != IS_STRING) { @@ -838,7 +838,7 @@ PHP_FUNCTION(sodium_crypto_generichash_final) if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|l", &state_zv, &hash_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } ZVAL_DEREF(state_zv); if (Z_TYPE_P(state_zv) != IS_STRING) { @@ -881,7 +881,7 @@ PHP_FUNCTION(sodium_crypto_box_keypair) size_t keypair_len; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } keypair_len = crypto_box_SECRETKEYBYTES + crypto_box_PUBLICKEYBYTES; keypair = zend_string_alloc(keypair_len, 0); @@ -907,7 +907,7 @@ PHP_FUNCTION(sodium_crypto_box_seed_keypair) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &seed, &seed_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (seed_len != crypto_box_SEEDBYTES) { zend_throw_exception(sodium_exception_ce, @@ -943,7 +943,7 @@ PHP_FUNCTION(sodium_crypto_box_keypair_from_secretkey_and_publickey) &secretkey, &secretkey_len, &publickey, &publickey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (secretkey_len != crypto_box_SECRETKEYBYTES) { zend_throw_exception(sodium_exception_ce, @@ -976,7 +976,7 @@ PHP_FUNCTION(sodium_crypto_box_secretkey) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &keypair, &keypair_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (keypair_len != crypto_box_SECRETKEYBYTES + crypto_box_PUBLICKEYBYTES) { @@ -1001,7 +1001,7 @@ PHP_FUNCTION(sodium_crypto_box_publickey) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &keypair, &keypair_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (keypair_len != crypto_box_SECRETKEYBYTES + crypto_box_PUBLICKEYBYTES) { @@ -1027,7 +1027,7 @@ PHP_FUNCTION(sodium_crypto_box_publickey_from_secretkey) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &secretkey, &secretkey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (secretkey_len != crypto_box_SECRETKEYBYTES) { zend_throw_exception(sodium_exception_ce, @@ -1063,7 +1063,7 @@ PHP_FUNCTION(sodium_crypto_box) &nonce, &nonce_len, &keypair, &keypair_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (nonce_len != crypto_box_NONCEBYTES) { zend_throw_exception(sodium_exception_ce, @@ -1113,7 +1113,7 @@ PHP_FUNCTION(sodium_crypto_box_open) &nonce, &nonce_len, &keypair, &keypair_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (nonce_len != crypto_box_NONCEBYTES) { zend_throw_exception(sodium_exception_ce, @@ -1156,7 +1156,7 @@ PHP_FUNCTION(sodium_crypto_box_seal) &msg, &msg_len, &publickey, &publickey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (publickey_len != crypto_box_PUBLICKEYBYTES) { zend_throw_exception(sodium_exception_ce, @@ -1194,7 +1194,7 @@ PHP_FUNCTION(sodium_crypto_box_seal_open) &ciphertext, &ciphertext_len, &keypair, &keypair_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (keypair_len != crypto_box_SECRETKEYBYTES + crypto_box_PUBLICKEYBYTES) { zend_throw_exception(sodium_exception_ce, @@ -1225,7 +1225,7 @@ PHP_FUNCTION(sodium_crypto_sign_keypair) size_t keypair_len; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } keypair_len = crypto_sign_SECRETKEYBYTES + crypto_sign_PUBLICKEYBYTES; keypair = zend_string_alloc(keypair_len, 0); @@ -1251,7 +1251,7 @@ PHP_FUNCTION(sodium_crypto_sign_seed_keypair) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &seed, &seed_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (seed_len != crypto_sign_SEEDBYTES) { zend_throw_exception(sodium_exception_ce, @@ -1287,7 +1287,7 @@ PHP_FUNCTION(sodium_crypto_sign_keypair_from_secretkey_and_publickey) &secretkey, &secretkey_len, &publickey, &publickey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (secretkey_len != crypto_sign_SECRETKEYBYTES) { zend_throw_exception(sodium_exception_ce, @@ -1320,7 +1320,7 @@ PHP_FUNCTION(sodium_crypto_sign_publickey_from_secretkey) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &secretkey, &secretkey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (secretkey_len != crypto_sign_SECRETKEYBYTES) { zend_throw_exception(sodium_exception_ce, @@ -1350,7 +1350,7 @@ PHP_FUNCTION(sodium_crypto_sign_secretkey) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &keypair, &keypair_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (keypair_len != crypto_sign_SECRETKEYBYTES + crypto_sign_PUBLICKEYBYTES) { @@ -1375,7 +1375,7 @@ PHP_FUNCTION(sodium_crypto_sign_publickey) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &keypair, &keypair_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (keypair_len != crypto_sign_SECRETKEYBYTES + crypto_sign_PUBLICKEYBYTES) { @@ -1406,7 +1406,7 @@ PHP_FUNCTION(sodium_crypto_sign) &msg, &msg_len, &secretkey, &secretkey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (secretkey_len != crypto_sign_SECRETKEYBYTES) { zend_throw_exception(sodium_exception_ce, @@ -1452,7 +1452,7 @@ PHP_FUNCTION(sodium_crypto_sign_open) &msg_signed, &msg_signed_len, &publickey, &publickey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (publickey_len != crypto_sign_PUBLICKEYBYTES) { zend_throw_exception(sodium_exception_ce, @@ -1496,7 +1496,7 @@ PHP_FUNCTION(sodium_crypto_sign_detached) &msg, &msg_len, &secretkey, &secretkey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (secretkey_len != crypto_sign_SECRETKEYBYTES) { zend_throw_exception(sodium_exception_ce, @@ -1538,7 +1538,7 @@ PHP_FUNCTION(sodium_crypto_sign_verify_detached) &msg, &msg_len, &publickey, &publickey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (signature_len != crypto_sign_BYTES) { zend_throw_exception(sodium_exception_ce, @@ -1574,7 +1574,7 @@ PHP_FUNCTION(sodium_crypto_stream) &nonce, &nonce_len, &key, &key_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (ciphertext_len <= 0 || ciphertext_len >= SIZE_MAX) { zend_throw_exception(sodium_exception_ce, "ciphertext length must be greater than 0", 0); @@ -1616,7 +1616,7 @@ PHP_FUNCTION(sodium_crypto_stream_xor) &nonce, &nonce_len, &key, &key_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (nonce_len != crypto_stream_NONCEBYTES) { zend_throw_exception(sodium_exception_ce, "nonce should be SODIUM_CRYPTO_STREAM_NONCEBYTES bytes", 0); @@ -1660,7 +1660,7 @@ PHP_FUNCTION(sodium_crypto_pwhash) &salt, &salt_len, &opslimit, &memlimit, &alg) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (hash_len <= 0 || hash_len >= 0xffffffff) { zend_throw_exception(sodium_exception_ce, "hash length must be greater than 0", 0); @@ -1741,7 +1741,7 @@ PHP_FUNCTION(sodium_crypto_pwhash_str) &passwd, &passwd_len, &opslimit, &memlimit) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (opslimit <= 0) { zend_throw_exception(sodium_exception_ce, "ops limit must be greater than 0", 0); @@ -1793,7 +1793,7 @@ PHP_FUNCTION(sodium_crypto_pwhash_str_needs_rehash) if (zend_parse_parameters(ZEND_NUM_ARGS(), "sll", &hash_str, &hash_str_len, &opslimit, &memlimit) == FAILURE) { zend_throw_exception(sodium_exception_ce, "a PHP string is required", 0); - return; + RETURN_THROWS(); } if (crypto_pwhash_str_needs_rehash(hash_str, opslimit, memlimit) == 0) { RETURN_FALSE; @@ -1813,7 +1813,7 @@ PHP_FUNCTION(sodium_crypto_pwhash_str_verify) &hash_str, &hash_str_len, &passwd, &passwd_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (passwd_len >= 0xffffffff) { zend_throw_exception(sodium_exception_ce, @@ -1849,7 +1849,7 @@ PHP_FUNCTION(sodium_crypto_pwhash_scryptsalsa208sha256) &salt, &salt_len, &opslimit, &memlimit) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (hash_len <= 0 || hash_len >= SIZE_MAX || hash_len > 0x1fffffffe0ULL) { zend_throw_exception(sodium_exception_ce, "hash length must be greater than 0", 0); @@ -1906,7 +1906,7 @@ PHP_FUNCTION(sodium_crypto_pwhash_scryptsalsa208sha256_str) &passwd, &passwd_len, &opslimit, &memlimit) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (opslimit <= 0) { zend_throw_exception(sodium_exception_ce, "ops limit must be greater than 0", 0); @@ -1952,7 +1952,7 @@ PHP_FUNCTION(sodium_crypto_pwhash_scryptsalsa208sha256_str_verify) &hash_str, &hash_str_len, &passwd, &passwd_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (passwd_len <= 0) { zend_error(E_WARNING, "empty password"); @@ -1972,7 +1972,7 @@ PHP_FUNCTION(sodium_crypto_pwhash_scryptsalsa208sha256_str_verify) PHP_FUNCTION(sodium_crypto_aead_aes256gcm_is_available) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } #ifdef HAVE_AESGCM RETURN_BOOL(crypto_aead_aes256gcm_is_available()); @@ -2002,7 +2002,7 @@ PHP_FUNCTION(sodium_crypto_aead_aes256gcm_encrypt) &npub, &npub_len, &secretkey, &secretkey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (npub_len != crypto_aead_aes256gcm_NPUBBYTES) { zend_throw_exception(sodium_exception_ce, @@ -2068,7 +2068,7 @@ PHP_FUNCTION(sodium_crypto_aead_aes256gcm_decrypt) &npub, &npub_len, &secretkey, &secretkey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (npub_len != crypto_aead_aes256gcm_NPUBBYTES) { zend_throw_exception(sodium_exception_ce, @@ -2136,7 +2136,7 @@ PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_encrypt) &npub, &npub_len, &secretkey, &secretkey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (npub_len != crypto_aead_chacha20poly1305_NPUBBYTES) { zend_throw_exception(sodium_exception_ce, @@ -2198,7 +2198,7 @@ PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_decrypt) &npub, &npub_len, &secretkey, &secretkey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (npub_len != crypto_aead_chacha20poly1305_NPUBBYTES) { zend_throw_exception(sodium_exception_ce, @@ -2261,7 +2261,7 @@ PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_ietf_encrypt) &npub, &npub_len, &secretkey, &secretkey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (npub_len != crypto_aead_chacha20poly1305_IETF_NPUBBYTES) { zend_throw_exception(sodium_exception_ce, @@ -2327,7 +2327,7 @@ PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_ietf_decrypt) &npub, &npub_len, &secretkey, &secretkey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (npub_len != crypto_aead_chacha20poly1305_IETF_NPUBBYTES) { zend_throw_exception(sodium_exception_ce, @@ -2396,7 +2396,7 @@ PHP_FUNCTION(sodium_crypto_aead_xchacha20poly1305_ietf_encrypt) &npub, &npub_len, &secretkey, &secretkey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (npub_len != crypto_aead_xchacha20poly1305_IETF_NPUBBYTES) { zend_throw_exception(sodium_exception_ce, @@ -2458,7 +2458,7 @@ PHP_FUNCTION(sodium_crypto_aead_xchacha20poly1305_ietf_decrypt) &npub, &npub_len, &secretkey, &secretkey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (npub_len != crypto_aead_xchacha20poly1305_IETF_NPUBBYTES) { zend_throw_exception(sodium_exception_ce, @@ -2517,7 +2517,7 @@ PHP_FUNCTION(sodium_bin2hex) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &bin, &bin_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (bin_len >= SIZE_MAX / 2U) { zend_throw_exception(sodium_exception_ce, "arithmetic overflow", 0); @@ -2546,7 +2546,7 @@ PHP_FUNCTION(sodium_hex2bin) &hex, &hex_len, &ignore, &ignore_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } bin_len = hex_len / 2; bin = zend_string_alloc(bin_len, 0); @@ -2580,7 +2580,7 @@ PHP_FUNCTION(sodium_bin2base64) if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl", &bin, &bin_len, &variant) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if ((((unsigned int) variant) & ~ 0x6U) != 0x1U) { zend_throw_exception(sodium_exception_ce, @@ -2614,7 +2614,7 @@ PHP_FUNCTION(sodium_base642bin) &b64, &b64_len, &variant, &ignore, &ignore_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if ((((unsigned int) variant) & ~ 0x6U) != 0x1U) { zend_throw_exception(sodium_exception_ce, @@ -2654,7 +2654,7 @@ PHP_FUNCTION(sodium_crypto_scalarmult) if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &n, &n_len, &p, &p_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (n_len != crypto_scalarmult_SCALARBYTES || p_len != crypto_scalarmult_BYTES) { @@ -2685,7 +2685,7 @@ PHP_FUNCTION(sodium_crypto_kx_seed_keypair) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &seed, &seed_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (seed_len != crypto_kx_SEEDBYTES) { zend_throw_exception(sodium_exception_ce, "seed must be SODIUM_CRYPTO_KX_SEEDBYTES bytes", 0); @@ -2713,7 +2713,7 @@ PHP_FUNCTION(sodium_crypto_kx_keypair) zend_string *keypair; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } keypair = zend_string_alloc(crypto_kx_SECRETKEYBYTES + crypto_kx_PUBLICKEYBYTES, 0); sk = (unsigned char *) ZSTR_VAL(keypair); @@ -2735,7 +2735,7 @@ PHP_FUNCTION(sodium_crypto_kx_secretkey) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &keypair, &keypair_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (keypair_len != crypto_kx_SECRETKEYBYTES + crypto_kx_PUBLICKEYBYTES) { @@ -2760,7 +2760,7 @@ PHP_FUNCTION(sodium_crypto_kx_publickey) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &keypair, &keypair_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (keypair_len != crypto_kx_SECRETKEYBYTES + crypto_kx_PUBLICKEYBYTES) { @@ -2793,7 +2793,7 @@ PHP_FUNCTION(sodium_crypto_kx_client_session_keys) &keypair, &keypair_len, &server_pk, &server_pk_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (keypair_len != crypto_kx_SECRETKEYBYTES + crypto_kx_PUBLICKEYBYTES) { zend_throw_exception(sodium_exception_ce, "keypair must be SODIUM_CRYPTO_KX_KEYPAIRBYTES bytes", 0); @@ -2843,7 +2843,7 @@ PHP_FUNCTION(sodium_crypto_kx_server_session_keys) &keypair, &keypair_len, &client_pk, &client_pk_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (keypair_len != crypto_kx_SECRETKEYBYTES + crypto_kx_PUBLICKEYBYTES) { zend_throw_exception(sodium_exception_ce, "keypair must be SODIUM_CRYPTO_KX_KEYPAIRBYTES bytes", 0); @@ -2889,7 +2889,7 @@ PHP_FUNCTION(sodium_crypto_auth) &msg, &msg_len, &key, &key_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (key_len != crypto_auth_KEYBYTES) { zend_throw_exception(sodium_exception_ce, "key must be SODIUM_CRYPTO_AUTH_KEYBYTES bytes", 0); @@ -2921,7 +2921,7 @@ PHP_FUNCTION(sodium_crypto_auth_verify) &msg, &msg_len, &key, &key_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (key_len != crypto_auth_KEYBYTES) { zend_throw_exception(sodium_exception_ce, "key must be SODIUM_CRYPTO_AUTH_KEYBYTES bytes", 0); @@ -2948,7 +2948,7 @@ PHP_FUNCTION(sodium_crypto_sign_ed25519_sk_to_curve25519) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &eddsakey, &eddsakey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (eddsakey_len != crypto_sign_SECRETKEYBYTES) { zend_throw_exception(sodium_exception_ce, @@ -2977,7 +2977,7 @@ PHP_FUNCTION(sodium_crypto_sign_ed25519_pk_to_curve25519) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &eddsakey, &eddsakey_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (eddsakey_len != crypto_sign_PUBLICKEYBYTES) { zend_throw_exception(sodium_exception_ce, @@ -3008,7 +3008,7 @@ PHP_FUNCTION(sodium_compare) &buf1, &len1, &buf2, &len2) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (len1 != len2) { zend_throw_exception(sodium_exception_ce, "arguments have different sizes", 0); @@ -3025,7 +3025,7 @@ PHP_FUNCTION(sodium_crypto_aead_aes256gcm_keygen) unsigned char key[crypto_aead_aes256gcm_KEYBYTES]; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); @@ -3037,7 +3037,7 @@ PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_keygen) unsigned char key[crypto_aead_chacha20poly1305_KEYBYTES]; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); @@ -3048,7 +3048,7 @@ PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_ietf_keygen) unsigned char key[crypto_aead_chacha20poly1305_IETF_KEYBYTES]; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); @@ -3060,7 +3060,7 @@ PHP_FUNCTION(sodium_crypto_aead_xchacha20poly1305_ietf_keygen) unsigned char key[crypto_aead_xchacha20poly1305_IETF_KEYBYTES]; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); @@ -3072,7 +3072,7 @@ PHP_FUNCTION(sodium_crypto_auth_keygen) unsigned char key[crypto_auth_KEYBYTES]; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); @@ -3083,7 +3083,7 @@ PHP_FUNCTION(sodium_crypto_generichash_keygen) unsigned char key[crypto_generichash_KEYBYTES]; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); @@ -3094,7 +3094,7 @@ PHP_FUNCTION(sodium_crypto_kdf_keygen) unsigned char key[crypto_kdf_KEYBYTES]; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); @@ -3105,7 +3105,7 @@ PHP_FUNCTION(sodium_crypto_secretbox_keygen) unsigned char key[crypto_secretbox_KEYBYTES]; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); @@ -3116,7 +3116,7 @@ PHP_FUNCTION(sodium_crypto_shorthash_keygen) unsigned char key[crypto_shorthash_KEYBYTES]; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); @@ -3127,7 +3127,7 @@ PHP_FUNCTION(sodium_crypto_stream_keygen) unsigned char key[crypto_stream_KEYBYTES]; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); @@ -3153,7 +3153,7 @@ PHP_FUNCTION(sodium_crypto_kdf_derive_from_key) &ctx, &ctx_len, &key, &key_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (subkey_len < crypto_kdf_BYTES_MIN) { zend_throw_exception(sodium_exception_ce, "subkey cannot be smaller than SODIUM_CRYPTO_KDF_BYTES_MIN", 0); @@ -3218,7 +3218,7 @@ PHP_FUNCTION(sodium_pad) if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl", &unpadded, &unpadded_len, &blocksize) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (blocksize <= 0) { zend_throw_exception(sodium_exception_ce, "block size cannot be less than 1", 0); @@ -3291,7 +3291,7 @@ PHP_FUNCTION(sodium_unpad) if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl", &padded, &padded_len, &blocksize) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (blocksize <= 0) { zend_throw_exception(sodium_exception_ce, "block size cannot be less than 1", 0); @@ -3349,7 +3349,7 @@ PHP_FUNCTION(sodium_crypto_secretstream_xchacha20poly1305_keygen) unsigned char key[crypto_secretstream_xchacha20poly1305_KEYBYTES]; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); @@ -3365,7 +3365,7 @@ PHP_FUNCTION(sodium_crypto_secretstream_xchacha20poly1305_init_push) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &key, &key_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (key_len != crypto_secretstream_xchacha20poly1305_KEYBYTES) { zend_throw_exception(sodium_exception_ce, @@ -3401,7 +3401,7 @@ PHP_FUNCTION(sodium_crypto_secretstream_xchacha20poly1305_push) &state_zv, &msg, &msg_len, &ad, &ad_len, &tag) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } ZVAL_DEREF(state_zv); if (Z_TYPE_P(state_zv) != IS_STRING) { @@ -3457,7 +3457,7 @@ PHP_FUNCTION(sodium_crypto_secretstream_xchacha20poly1305_init_pull) &header, &header_len, &key, &key_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } if (header_len != crypto_secretstream_xchacha20poly1305_HEADERBYTES) { zend_throw_exception(sodium_exception_ce, @@ -3497,7 +3497,7 @@ PHP_FUNCTION(sodium_crypto_secretstream_xchacha20poly1305_pull) &state_zv, &c, &c_len, &ad, &ad_len) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } ZVAL_DEREF(state_zv); if (Z_TYPE_P(state_zv) != IS_STRING) { @@ -3542,7 +3542,7 @@ PHP_FUNCTION(sodium_crypto_secretstream_xchacha20poly1305_rekey) if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &state_zv) == FAILURE) { sodium_remove_param_values_from_backtrace(EG(exception)); - return; + RETURN_THROWS(); } ZVAL_DEREF(state_zv); if (Z_TYPE_P(state_zv) != IS_STRING) { diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 39c6d34b5a..06371b741d 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -89,7 +89,7 @@ PHP_FUNCTION(class_parents) zend_bool autoload = 1; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|b", &obj, &autoload) == FAILURE) { - return; + RETURN_THROWS(); } if (Z_TYPE_P(obj) != IS_OBJECT && Z_TYPE_P(obj) != IS_STRING) { @@ -123,7 +123,7 @@ PHP_FUNCTION(class_implements) zend_class_entry *ce; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|b", &obj, &autoload) == FAILURE) { - return; + RETURN_THROWS(); } if (Z_TYPE_P(obj) != IS_OBJECT && Z_TYPE_P(obj) != IS_STRING) { zend_type_error("object or string expected"); @@ -152,7 +152,7 @@ PHP_FUNCTION(class_uses) zend_class_entry *ce; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|b", &obj, &autoload) == FAILURE) { - return; + RETURN_THROWS(); } if (Z_TYPE_P(obj) != IS_OBJECT && Z_TYPE_P(obj) != IS_STRING) { zend_type_error("object or string expected"); @@ -237,7 +237,7 @@ PHP_FUNCTION(class_uses) PHP_FUNCTION(spl_classes) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } array_init(return_value); @@ -313,7 +313,7 @@ PHP_FUNCTION(spl_autoload) zend_string *class_name, *lc_name, *file_exts = SPL_G(autoload_extensions); if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|S", &class_name, &file_exts) == FAILURE) { - return; + RETURN_THROWS(); } if (file_exts == NULL) { /* autoload_extensions is not initialized, set to defaults */ @@ -348,7 +348,7 @@ PHP_FUNCTION(spl_autoload_extensions) zend_string *file_exts = NULL; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|S", &file_exts) == FAILURE) { - return; + RETURN_THROWS(); } if (file_exts) { if (SPL_G(autoload_extensions)) { @@ -398,7 +398,7 @@ PHP_FUNCTION(spl_autoload_call) autoload_func_info *alfi; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &class_name) == FAILURE || Z_TYPE_P(class_name) != IS_STRING) { - return; + RETURN_THROWS(); } if (SPL_G(autoload_functions)) { @@ -512,7 +512,7 @@ PHP_FUNCTION(spl_autoload_register) zend_fcall_info_cache fcc; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|zbb", &zcallable, &do_throw, &prepend) == FAILURE) { - return; + RETURN_THROWS(); } if (ZEND_NUM_ARGS()) { @@ -684,7 +684,7 @@ PHP_FUNCTION(spl_autoload_unregister) zend_fcall_info_cache fcc; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &zcallable) == FAILURE) { - return; + RETURN_THROWS(); } if (!zend_is_callable_ex(zcallable, NULL, IS_CALLABLE_CHECK_SYNTAX_ONLY, &func_name, &fcc, &error)) { @@ -762,7 +762,7 @@ PHP_FUNCTION(spl_autoload_functions) autoload_func_info *alfi; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (!EG(autoload_func)) { @@ -812,7 +812,7 @@ PHP_FUNCTION(spl_object_hash) zval *obj; if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &obj) == FAILURE) { - return; + RETURN_THROWS(); } RETURN_NEW_STR(php_spl_object_hash(obj)); diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index bf33287fd0..0fb5cdcbe6 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -703,7 +703,7 @@ SPL_METHOD(Array, offsetExists) { zval *index; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &index) == FAILURE) { - return; + RETURN_THROWS(); } RETURN_BOOL(spl_array_has_dimension_ex(0, Z_OBJ_P(ZEND_THIS), index, 2)); } /* }}} */ @@ -715,7 +715,7 @@ SPL_METHOD(Array, offsetGet) { zval *value, *index; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &index) == FAILURE) { - return; + RETURN_THROWS(); } value = spl_array_read_dimension_ex(0, Z_OBJ_P(ZEND_THIS), index, BP_VAR_R, return_value); if (value != return_value) { @@ -730,7 +730,7 @@ SPL_METHOD(Array, offsetSet) { zval *index, *value; if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &index, &value) == FAILURE) { - return; + RETURN_THROWS(); } spl_array_write_dimension_ex(0, Z_OBJ_P(ZEND_THIS), index, value); } /* }}} */ @@ -755,7 +755,7 @@ SPL_METHOD(Array, append) zval *value; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &value) == FAILURE) { - return; + RETURN_THROWS(); } spl_array_iterator_append(ZEND_THIS, value); } /* }}} */ @@ -767,7 +767,7 @@ SPL_METHOD(Array, offsetUnset) { zval *index; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &index) == FAILURE) { - return; + RETURN_THROWS(); } spl_array_unset_dimension_ex(0, Z_OBJ_P(ZEND_THIS), index); } /* }}} */ @@ -1197,7 +1197,7 @@ SPL_METHOD(Array, __construct) } if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|lC", &array, &ar_flags, &ce_get_iterator) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLARRAY_P(object); @@ -1226,7 +1226,7 @@ SPL_METHOD(ArrayIterator, __construct) } if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|l", &array, &ar_flags) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLARRAY_P(object); @@ -1261,7 +1261,7 @@ SPL_METHOD(Array, getIteratorClass) spl_array_object *intern = Z_SPLARRAY_P(object); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } zend_string_addref(intern->ce_get_iterator->name); @@ -1277,7 +1277,7 @@ SPL_METHOD(Array, getFlags) spl_array_object *intern = Z_SPLARRAY_P(object); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(intern->ar_flags & ~SPL_ARRAY_INT_MASK); @@ -1293,7 +1293,7 @@ SPL_METHOD(Array, setFlags) zend_long ar_flags = 0; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &ar_flags) == FAILURE) { - return; + RETURN_THROWS(); } intern->ar_flags = (intern->ar_flags & SPL_ARRAY_INT_MASK) | (ar_flags & ~SPL_ARRAY_INT_MASK); @@ -1308,7 +1308,7 @@ SPL_METHOD(Array, exchangeArray) spl_array_object *intern = Z_SPLARRAY_P(object); if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &array) == FAILURE) { - return; + RETURN_THROWS(); } if (intern->nApplyCount > 0) { @@ -1329,7 +1329,7 @@ SPL_METHOD(Array, getIterator) spl_array_object *intern = Z_SPLARRAY_P(object); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } ZVAL_OBJ(return_value, spl_array_object_new_ex(intern->ce_get_iterator, Z_OBJ_P(object), 0)); @@ -1344,7 +1344,7 @@ SPL_METHOD(Array, rewind) spl_array_object *intern = Z_SPLARRAY_P(object); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } spl_array_rewind(intern); @@ -1362,7 +1362,7 @@ SPL_METHOD(Array, seek) int result; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &position) == FAILURE) { - return; + RETURN_THROWS(); } opos = position; @@ -1428,7 +1428,7 @@ SPL_METHOD(Array, count) spl_array_object *intern = Z_SPLARRAY_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(spl_array_object_count_elements_helper(intern)); @@ -1532,7 +1532,7 @@ SPL_METHOD(Array, current) HashTable *aht = spl_array_get_hash_table(intern); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if ((entry = zend_hash_get_current_data_ex(aht, spl_array_get_pos_ptr(aht, intern))) == NULL) { @@ -1553,7 +1553,7 @@ SPL_METHOD(Array, current) SPL_METHOD(Array, key) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } spl_array_iterator_key(ZEND_THIS, return_value); @@ -1577,7 +1577,7 @@ SPL_METHOD(Array, next) HashTable *aht = spl_array_get_hash_table(intern); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } spl_array_next_ex(intern, aht); @@ -1593,7 +1593,7 @@ SPL_METHOD(Array, valid) HashTable *aht = spl_array_get_hash_table(intern); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_BOOL(zend_hash_has_more_elements_ex(aht, spl_array_get_pos_ptr(aht, intern)) == SUCCESS); @@ -1609,7 +1609,7 @@ SPL_METHOD(Array, hasChildren) HashTable *aht = spl_array_get_hash_table(intern); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if ((entry = zend_hash_get_current_data_ex(aht, spl_array_get_pos_ptr(aht, intern))) == NULL) { @@ -1634,7 +1634,7 @@ SPL_METHOD(Array, getChildren) HashTable *aht = spl_array_get_hash_table(intern); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if ((entry = zend_hash_get_current_data_ex(aht, spl_array_get_pos_ptr(aht, intern))) == NULL) { @@ -1725,7 +1725,7 @@ SPL_METHOD(Array, unserialize) zend_long flags; if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &buf, &buf_len) == FAILURE) { - return; + RETURN_THROWS(); } if (buf_len == 0) { @@ -1830,7 +1830,7 @@ SPL_METHOD(Array, __serialize) zval tmp; if (zend_parse_parameters_none_throw() == FAILURE) { - return; + RETURN_THROWS(); } array_init(return_value); @@ -1864,7 +1864,7 @@ SPL_METHOD(Array, __unserialize) zend_long flags; if (zend_parse_parameters(ZEND_NUM_ARGS(), "h", &data) == FAILURE) { - return; + RETURN_THROWS(); } flags_zv = zend_hash_index_find(data, 0); diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 5d627d1218..ffd3bf94f1 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -766,7 +766,7 @@ SPL_METHOD(DirectoryIterator, rewind) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern->u.dir.index = 0; @@ -784,7 +784,7 @@ SPL_METHOD(DirectoryIterator, key) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (intern->u.dir.dirp) { @@ -800,7 +800,7 @@ SPL_METHOD(DirectoryIterator, key) SPL_METHOD(DirectoryIterator, current) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } ZVAL_OBJ(return_value, Z_OBJ_P(ZEND_THIS)); Z_ADDREF_P(return_value); @@ -815,7 +815,7 @@ SPL_METHOD(DirectoryIterator, next) int skip_dots = SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_SKIPDOTS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern->u.dir.index++; @@ -838,7 +838,7 @@ SPL_METHOD(DirectoryIterator, seek) zend_long pos; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &pos) == FAILURE) { - return; + RETURN_THROWS(); } if (intern->u.dir.index > pos) { @@ -866,7 +866,7 @@ SPL_METHOD(DirectoryIterator, valid) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_BOOL(intern->u.dir.entry.d_name[0] != '\0'); @@ -882,7 +882,7 @@ SPL_METHOD(SplFileInfo, getPath) size_t path_len; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } path = spl_filesystem_object_get_path(intern, &path_len); @@ -902,7 +902,7 @@ SPL_METHOD(SplFileInfo, getFilename) size_t path_len; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } spl_filesystem_object_get_path(intern, &path_len); @@ -922,7 +922,7 @@ SPL_METHOD(DirectoryIterator, getFilename) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_STRING(intern->u.dir.entry.d_name); @@ -942,7 +942,7 @@ SPL_METHOD(SplFileInfo, getExtension) zend_string *ret; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } spl_filesystem_object_get_path(intern, &path_len); @@ -980,7 +980,7 @@ SPL_METHOD(DirectoryIterator, getExtension) zend_string *fname; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } fname = php_basename(intern->u.dir.entry.d_name, strlen(intern->u.dir.entry.d_name), NULL, 0); @@ -1007,7 +1007,7 @@ SPL_METHOD(SplFileInfo, getBasename) size_t slen = 0, path_len; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &suffix, &slen) == FAILURE) { - return; + RETURN_THROWS(); } spl_filesystem_object_get_path(intern, &path_len); @@ -1034,7 +1034,7 @@ SPL_METHOD(DirectoryIterator, getBasename) zend_string *fname; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &suffix, &slen) == FAILURE) { - return; + RETURN_THROWS(); } fname = php_basename(intern->u.dir.entry.d_name, strlen(intern->u.dir.entry.d_name), suffix, slen); @@ -1052,7 +1052,7 @@ SPL_METHOD(SplFileInfo, getPathname) size_t path_len; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } path = spl_filesystem_object_get_pathname(intern, &path_len); if (path != NULL) { @@ -1070,7 +1070,7 @@ SPL_METHOD(FilesystemIterator, key) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (SPL_FILE_DIR_KEY(intern, SPL_FILE_DIR_KEY_AS_FILENAME)) { @@ -1089,7 +1089,7 @@ SPL_METHOD(FilesystemIterator, current) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (SPL_FILE_DIR_CURRENT(intern, SPL_FILE_DIR_CURRENT_AS_PATHNAME)) { @@ -1113,7 +1113,7 @@ SPL_METHOD(DirectoryIterator, isDot) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_BOOL(spl_filesystem_is_dot(intern->u.dir.entry.d_name)); @@ -1132,7 +1132,7 @@ SPL_METHOD(SplFileInfo, __construct) size_t len; if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &path, &len) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1150,7 +1150,7 @@ SPL_METHOD(SplFileInfo, func_name) \ spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); \ zend_error_handling error_handling; \ if (zend_parse_parameters_none() == FAILURE) { \ - return; \ + RETURN_THROWS(); \ } \ \ zend_replace_error_handling(EH_THROW, spl_ce_RuntimeException, &error_handling);\ @@ -1245,7 +1245,7 @@ SPL_METHOD(SplFileInfo, getLinkTarget) zend_error_handling error_handling; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } zend_replace_error_handling(EH_THROW, spl_ce_RuntimeException, &error_handling); @@ -1296,7 +1296,7 @@ SPL_METHOD(SplFileInfo, getRealPath) zend_error_handling error_handling; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } zend_replace_error_handling(EH_THROW, spl_ce_RuntimeException, &error_handling); @@ -1346,7 +1346,7 @@ SPL_METHOD(SplFileInfo, setFileClass) zend_class_entry *ce = spl_ce_SplFileObject; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|C", &ce) == FAILURE) { - return; + RETURN_THROWS(); } intern->file_class = ce; @@ -1361,7 +1361,7 @@ SPL_METHOD(SplFileInfo, setInfoClass) zend_class_entry *ce = spl_ce_SplFileInfo; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|C", &ce) == FAILURE) { - return; + RETURN_THROWS(); } intern->info_class = ce; @@ -1376,7 +1376,7 @@ SPL_METHOD(SplFileInfo, getFileInfo) zend_class_entry *ce = intern->info_class; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|C", &ce) == FAILURE) { - return; + RETURN_THROWS(); } spl_filesystem_object_create_type(ZEND_NUM_ARGS(), intern, SPL_FS_INFO, ce, return_value); @@ -1393,7 +1393,7 @@ SPL_METHOD(SplFileInfo, getPathInfo) char *path; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|C", &ce) == FAILURE) { - return; + RETURN_THROWS(); } path = spl_filesystem_object_get_pathname(intern, &path_len); @@ -1431,7 +1431,7 @@ SPL_METHOD(FilesystemIterator, rewind) int skip_dots = SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_SKIPDOTS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern->u.dir.index = 0; @@ -1451,7 +1451,7 @@ SPL_METHOD(FilesystemIterator, getFlags) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(intern->flags & (SPL_FILE_DIR_KEY_MODE_MASK | SPL_FILE_DIR_CURRENT_MODE_MASK | SPL_FILE_DIR_OTHERS_MASK)); @@ -1465,7 +1465,7 @@ SPL_METHOD(FilesystemIterator, setFlags) zend_long flags; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &flags) == FAILURE) { - return; + RETURN_THROWS(); } intern->flags &= ~(SPL_FILE_DIR_KEY_MODE_MASK|SPL_FILE_DIR_CURRENT_MODE_MASK|SPL_FILE_DIR_OTHERS_MASK); @@ -1480,7 +1480,7 @@ SPL_METHOD(RecursiveDirectoryIterator, hasChildren) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters(ZEND_NUM_ARGS(), "|b", &allow_links) == FAILURE) { - return; + RETURN_THROWS(); } if (spl_filesystem_is_invalid_or_dot(intern->u.dir.entry.d_name)) { RETURN_FALSE; @@ -1507,7 +1507,7 @@ SPL_METHOD(RecursiveDirectoryIterator, getChildren) char slash = SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_UNIXPATHS) ? '/' : DEFAULT_SLASH; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } spl_filesystem_object_get_file_name(intern); @@ -1539,7 +1539,7 @@ SPL_METHOD(RecursiveDirectoryIterator, getSubPath) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (intern->u.dir.sub_path) { @@ -1558,7 +1558,7 @@ SPL_METHOD(RecursiveDirectoryIterator, getSubPathname) char slash = SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_UNIXPATHS) ? '/' : DEFAULT_SLASH; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (intern->u.dir.sub_path) { @@ -1593,7 +1593,7 @@ SPL_METHOD(GlobIterator, count) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (intern->u.dir.dirp && php_stream_is(intern->u.dir.dirp ,&php_glob_stream_ops)) { @@ -2258,7 +2258,7 @@ SPL_METHOD(SplFileObject, __construct) &use_include_path, &intern->u.file.zcontext) == FAILURE) { intern->u.file.open_mode = NULL; intern->file_name = NULL; - return; + RETURN_THROWS(); } if (intern->u.file.open_mode == NULL) { @@ -2308,7 +2308,7 @@ SPL_METHOD(SplTempFileObject, __construct) zend_error_handling error_handling; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &max_memory) == FAILURE) { - return; + RETURN_THROWS(); } if (max_memory < 0) { @@ -2339,7 +2339,7 @@ SPL_METHOD(SplFileObject, rewind) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } spl_filesystem_file_rewind(ZEND_THIS, intern); @@ -2352,7 +2352,7 @@ SPL_METHOD(SplFileObject, eof) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if(!intern->u.file.stream) { @@ -2370,7 +2370,7 @@ SPL_METHOD(SplFileObject, valid) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (SPL_HAS_FLAG(intern->flags, SPL_FILE_OBJECT_READ_AHEAD)) { @@ -2390,7 +2390,7 @@ SPL_METHOD(SplFileObject, fgets) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if(!intern->u.file.stream) { @@ -2411,7 +2411,7 @@ SPL_METHOD(SplFileObject, current) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if(!intern->u.file.stream) { @@ -2440,7 +2440,7 @@ SPL_METHOD(SplFileObject, key) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } /* Do not read the next line to support correct counting with fgetc() @@ -2457,7 +2457,7 @@ SPL_METHOD(SplFileObject, next) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } spl_filesystem_file_free_line(intern); @@ -2474,7 +2474,7 @@ SPL_METHOD(SplFileObject, setFlags) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &intern->flags) == FAILURE) { - return; + RETURN_THROWS(); } } /* }}} */ @@ -2485,7 +2485,7 @@ SPL_METHOD(SplFileObject, getFlags) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(intern->flags & SPL_FILE_OBJECT_MASK); @@ -2500,7 +2500,7 @@ SPL_METHOD(SplFileObject, setMaxLineLen) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &max_len) == FAILURE) { - return; + RETURN_THROWS(); } if (max_len < 0) { @@ -2518,7 +2518,7 @@ SPL_METHOD(SplFileObject, getMaxLineLen) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG((zend_long)intern->u.file.max_line_len); @@ -2529,7 +2529,7 @@ SPL_METHOD(SplFileObject, getMaxLineLen) SPL_METHOD(SplFileObject, hasChildren) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_FALSE; @@ -2540,7 +2540,7 @@ SPL_METHOD(SplFileObject, hasChildren) SPL_METHOD(SplFileObject, getChildren) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } /* return NULL */ } /* }}} */ @@ -2676,7 +2676,7 @@ SPL_METHOD(SplFileObject, setCsvControl) { case 3: switch (esc_len) { - case 0: + case 0: escape = PHP_CSV_NO_ESCAPE; break; case 1: @@ -2785,7 +2785,7 @@ SPL_METHOD(SplFileObject, fseek) zend_long pos, whence = SEEK_SET; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|l", &pos, &whence) == FAILURE) { - return; + RETURN_THROWS(); } if(!intern->u.file.stream) { @@ -2870,7 +2870,7 @@ SPL_METHOD(SplFileObject, fwrite) ssize_t written; if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &str, &str_len, &length) == FAILURE) { - return; + RETURN_THROWS(); } if(!intern->u.file.stream) { @@ -2904,7 +2904,7 @@ SPL_METHOD(SplFileObject, fread) zend_string *str; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &length) == FAILURE) { - return; + RETURN_THROWS(); } if(!intern->u.file.stream) { @@ -2937,7 +2937,7 @@ SPL_METHOD(SplFileObject, ftruncate) zend_long size; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &size) == FAILURE) { - return; + RETURN_THROWS(); } if(!intern->u.file.stream) { @@ -2961,7 +2961,7 @@ SPL_METHOD(SplFileObject, seek) zend_long line_pos; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &line_pos) == FAILURE) { - return; + RETURN_THROWS(); } if(!intern->u.file.stream) { zend_throw_exception_ex(spl_ce_RuntimeException, 0, "Object not initialized"); diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c index baa6cf23ef..fa37015c61 100644 --- a/ext/spl/spl_dllist.c +++ b/ext/spl/spl_dllist.c @@ -558,7 +558,7 @@ SPL_METHOD(SplDoublyLinkedList, push) spl_dllist_object *intern; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &value) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -576,7 +576,7 @@ SPL_METHOD(SplDoublyLinkedList, unshift) spl_dllist_object *intern; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &value) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -593,7 +593,7 @@ SPL_METHOD(SplDoublyLinkedList, pop) spl_dllist_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -613,7 +613,7 @@ SPL_METHOD(SplDoublyLinkedList, shift) spl_dllist_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -634,7 +634,7 @@ SPL_METHOD(SplDoublyLinkedList, top) spl_dllist_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -657,7 +657,7 @@ SPL_METHOD(SplDoublyLinkedList, bottom) spl_dllist_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -680,7 +680,7 @@ SPL_METHOD(SplDoublyLinkedList, count) spl_dllist_object *intern = Z_SPLDLLIST_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } count = spl_ptr_llist_count(intern->llist); @@ -695,7 +695,7 @@ SPL_METHOD(SplDoublyLinkedList, isEmpty) zend_long count; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } spl_dllist_object_count_elements(Z_OBJ_P(ZEND_THIS), &count); @@ -711,7 +711,7 @@ SPL_METHOD(SplDoublyLinkedList, setIteratorMode) spl_dllist_object *intern; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &value) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -735,7 +735,7 @@ SPL_METHOD(SplDoublyLinkedList, getIteratorMode) spl_dllist_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -753,7 +753,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetExists) zend_long index; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &zindex) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -772,7 +772,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetGet) spl_ptr_llist_element *element; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &zindex) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -802,7 +802,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetSet) spl_dllist_object *intern; if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &zindex, &value) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -858,7 +858,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetUnset) spl_ptr_llist *llist; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &zindex) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -1031,7 +1031,7 @@ SPL_METHOD(SplDoublyLinkedList, key) spl_dllist_object *intern = Z_SPLDLLIST_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(intern->traverse_position); @@ -1045,7 +1045,7 @@ SPL_METHOD(SplDoublyLinkedList, prev) spl_dllist_object *intern = Z_SPLDLLIST_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } spl_dllist_it_helper_move_forward(&intern->traverse_pointer, &intern->traverse_position, intern->llist, intern->flags ^ SPL_DLLIST_IT_LIFO); @@ -1059,7 +1059,7 @@ SPL_METHOD(SplDoublyLinkedList, next) spl_dllist_object *intern = Z_SPLDLLIST_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } spl_dllist_it_helper_move_forward(&intern->traverse_pointer, &intern->traverse_position, intern->llist, intern->flags); @@ -1073,7 +1073,7 @@ SPL_METHOD(SplDoublyLinkedList, valid) spl_dllist_object *intern = Z_SPLDLLIST_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_BOOL(intern->traverse_pointer != NULL); @@ -1087,7 +1087,7 @@ SPL_METHOD(SplDoublyLinkedList, rewind) spl_dllist_object *intern = Z_SPLDLLIST_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } spl_dllist_it_helper_rewind(&intern->traverse_pointer, &intern->traverse_position, intern->llist, intern->flags); @@ -1102,7 +1102,7 @@ SPL_METHOD(SplDoublyLinkedList, current) spl_ptr_llist_element *element = intern->traverse_pointer; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (element == NULL || Z_ISUNDEF(element->data)) { @@ -1126,7 +1126,7 @@ SPL_METHOD(SplDoublyLinkedList, serialize) php_serialize_data_t var_hash; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } PHP_VAR_SERIALIZE_INIT(var_hash); @@ -1170,7 +1170,7 @@ SPL_METHOD(SplDoublyLinkedList, unserialize) php_unserialize_data_t var_hash; if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &buf, &buf_len) == FAILURE) { - return; + RETURN_THROWS(); } if (buf_len == 0) { @@ -1222,7 +1222,7 @@ SPL_METHOD(SplDoublyLinkedList, __serialize) zval tmp; if (zend_parse_parameters_none_throw() == FAILURE) { - return; + RETURN_THROWS(); } array_init(return_value); @@ -1253,7 +1253,7 @@ SPL_METHOD(SplDoublyLinkedList, __unserialize) { zval *flags_zv, *storage_zv, *members_zv, *elem; if (zend_parse_parameters(ZEND_NUM_ARGS(), "h", &data) == FAILURE) { - return; + RETURN_THROWS(); } flags_zv = zend_hash_index_find(data, 0); @@ -1286,7 +1286,7 @@ SPL_METHOD(SplDoublyLinkedList, add) zend_long index; if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &zindex, &value) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLDLLIST_P(ZEND_THIS); diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index 8c579b6cfb..2c93c15864 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -546,7 +546,7 @@ SPL_METHOD(SplFixedArray, __construct) zend_long size = 0; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &size) == FAILURE) { - return; + RETURN_THROWS(); } if (size < 0) { @@ -574,7 +574,7 @@ SPL_METHOD(SplFixedArray, __wakeup) zval *data; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (intern->array.size == 0) { @@ -603,7 +603,7 @@ SPL_METHOD(SplFixedArray, count) spl_fixedarray_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLFIXEDARRAY_P(object); @@ -618,7 +618,7 @@ SPL_METHOD(SplFixedArray, toArray) spl_fixedarray_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLFIXEDARRAY_P(ZEND_THIS); @@ -652,7 +652,7 @@ SPL_METHOD(SplFixedArray, fromArray) zend_bool save_indexes = 1; if (zend_parse_parameters(ZEND_NUM_ARGS(), "a|b", &data, &save_indexes) == FAILURE) { - return; + RETURN_THROWS(); } num = zend_hash_num_elements(Z_ARRVAL_P(data)); @@ -714,7 +714,7 @@ SPL_METHOD(SplFixedArray, getSize) spl_fixedarray_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLFIXEDARRAY_P(object); @@ -731,7 +731,7 @@ SPL_METHOD(SplFixedArray, setSize) zend_long size; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &size) == FAILURE) { - return; + RETURN_THROWS(); } if (size < 0) { @@ -754,7 +754,7 @@ SPL_METHOD(SplFixedArray, offsetExists) spl_fixedarray_object *intern; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &zindex) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLFIXEDARRAY_P(ZEND_THIS); @@ -770,7 +770,7 @@ SPL_METHOD(SplFixedArray, offsetGet) spl_fixedarray_object *intern; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &zindex) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLFIXEDARRAY_P(ZEND_THIS); @@ -791,7 +791,7 @@ SPL_METHOD(SplFixedArray, offsetSet) spl_fixedarray_object *intern; if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &zindex, &value) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLFIXEDARRAY_P(ZEND_THIS); @@ -807,7 +807,7 @@ SPL_METHOD(SplFixedArray, offsetUnset) spl_fixedarray_object *intern; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &zindex) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLFIXEDARRAY_P(ZEND_THIS); @@ -906,7 +906,7 @@ SPL_METHOD(SplFixedArray, key) spl_fixedarray_object *intern = Z_SPLFIXEDARRAY_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(intern->current); @@ -920,7 +920,7 @@ SPL_METHOD(SplFixedArray, next) spl_fixedarray_object *intern = Z_SPLFIXEDARRAY_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern->current++; @@ -934,7 +934,7 @@ SPL_METHOD(SplFixedArray, valid) spl_fixedarray_object *intern = Z_SPLFIXEDARRAY_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_BOOL(intern->current >= 0 && intern->current < intern->array.size); @@ -948,7 +948,7 @@ SPL_METHOD(SplFixedArray, rewind) spl_fixedarray_object *intern = Z_SPLFIXEDARRAY_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern->current = 0; @@ -963,7 +963,7 @@ SPL_METHOD(SplFixedArray, current) spl_fixedarray_object *intern = Z_SPLFIXEDARRAY_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } ZVAL_LONG(&zindex, intern->current); diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c index 73fdf97d99..d43d8c5603 100644 --- a/ext/spl/spl_heap.c +++ b/ext/spl/spl_heap.c @@ -579,7 +579,7 @@ SPL_METHOD(SplHeap, count) spl_heap_object *intern = Z_SPLHEAP_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } count = spl_ptr_heap_count(intern->heap); @@ -594,7 +594,7 @@ SPL_METHOD(SplHeap, isEmpty) spl_heap_object *intern = Z_SPLHEAP_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_BOOL(spl_ptr_heap_count(intern->heap) == 0); @@ -609,7 +609,7 @@ SPL_METHOD(SplHeap, insert) spl_heap_object *intern; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &value) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLHEAP_P(ZEND_THIS); @@ -633,7 +633,7 @@ SPL_METHOD(SplHeap, extract) spl_heap_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLHEAP_P(ZEND_THIS); @@ -659,7 +659,7 @@ SPL_METHOD(SplPriorityQueue, insert) spl_pqueue_elem elem; if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &data, &priority) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLHEAP_P(ZEND_THIS); @@ -686,7 +686,7 @@ SPL_METHOD(SplPriorityQueue, extract) spl_heap_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLHEAP_P(ZEND_THIS); @@ -714,7 +714,7 @@ SPL_METHOD(SplPriorityQueue, top) spl_pqueue_elem *elem; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLHEAP_P(ZEND_THIS); @@ -744,7 +744,7 @@ SPL_METHOD(SplPriorityQueue, setExtractFlags) spl_heap_object *intern; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &value) == FAILURE) { - return; + RETURN_THROWS(); } value &= SPL_PQUEUE_EXTR_MASK; @@ -766,7 +766,7 @@ SPL_METHOD(SplPriorityQueue, getExtractFlags) spl_heap_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLHEAP_P(ZEND_THIS); @@ -782,7 +782,7 @@ SPL_METHOD(SplHeap, recoverFromCorruption) spl_heap_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLHEAP_P(ZEND_THIS); @@ -800,7 +800,7 @@ SPL_METHOD(SplHeap, isCorrupted) spl_heap_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLHEAP_P(ZEND_THIS); @@ -816,7 +816,7 @@ SPL_METHOD(SplPriorityQueue, compare) zval *a, *b; if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &a, &b) == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(spl_ptr_heap_zval_max_cmp(a, b, NULL)); @@ -831,7 +831,7 @@ SPL_METHOD(SplHeap, top) spl_heap_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLHEAP_P(ZEND_THIS); @@ -859,7 +859,7 @@ SPL_METHOD(SplMinHeap, compare) zval *a, *b; if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &a, &b) == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(spl_ptr_heap_zval_min_cmp(a, b, NULL)); @@ -873,7 +873,7 @@ SPL_METHOD(SplMaxHeap, compare) zval *a, *b; if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &a, &b) == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(spl_ptr_heap_zval_max_cmp(a, b, NULL)); @@ -969,7 +969,7 @@ SPL_METHOD(SplHeap, key) spl_heap_object *intern = Z_SPLHEAP_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(intern->heap->count - 1); @@ -983,7 +983,7 @@ SPL_METHOD(SplHeap, next) spl_heap_object *intern = Z_SPLHEAP_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } spl_ptr_heap_delete_top(intern->heap, NULL, ZEND_THIS); @@ -997,7 +997,7 @@ SPL_METHOD(SplHeap, valid) spl_heap_object *intern = Z_SPLHEAP_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_BOOL(intern->heap->count != 0); @@ -1009,7 +1009,7 @@ SPL_METHOD(SplHeap, valid) SPL_METHOD(SplHeap, rewind) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } /* do nothing, the iterator always points to the top element */ } @@ -1022,7 +1022,7 @@ SPL_METHOD(SplHeap, current) spl_heap_object *intern = Z_SPLHEAP_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (!intern->heap->count) { @@ -1041,7 +1041,7 @@ SPL_METHOD(SplPriorityQueue, current) spl_heap_object *intern = Z_SPLHEAP_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (!intern->heap->count) { diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 331f007d5d..255f674aab 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -614,7 +614,7 @@ SPL_METHOD(RecursiveIteratorIterator, rewind) spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } spl_recursive_it_rewind_ex(object, ZEND_THIS); @@ -627,7 +627,7 @@ SPL_METHOD(RecursiveIteratorIterator, valid) spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_BOOL(spl_recursive_it_valid_ex(object, ZEND_THIS) == SUCCESS); @@ -641,7 +641,7 @@ SPL_METHOD(RecursiveIteratorIterator, key) zend_object_iterator *iterator; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_SUB_ITERATOR(iterator, object); @@ -662,7 +662,7 @@ SPL_METHOD(RecursiveIteratorIterator, current) zval *data; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_SUB_ITERATOR(iterator, object); @@ -680,7 +680,7 @@ SPL_METHOD(RecursiveIteratorIterator, next) spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } spl_recursive_it_move_forward_ex(object, ZEND_THIS); @@ -693,7 +693,7 @@ SPL_METHOD(RecursiveIteratorIterator, getDepth) spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(object->level); @@ -708,7 +708,7 @@ SPL_METHOD(RecursiveIteratorIterator, getSubIterator) zval *value; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &level) == FAILURE) { - return; + RETURN_THROWS(); } if (level < 0 || level > object->level) { RETURN_NULL(); @@ -732,7 +732,7 @@ SPL_METHOD(RecursiveIteratorIterator, getInnerIterator) zval *zobject; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_SUB_ELEMENT_ADDR(zobject, object, zobject); @@ -745,7 +745,7 @@ SPL_METHOD(RecursiveIteratorIterator, getInnerIterator) SPL_METHOD(RecursiveIteratorIterator, beginIteration) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } /* nothing to do */ } /* }}} */ @@ -755,7 +755,7 @@ SPL_METHOD(RecursiveIteratorIterator, beginIteration) SPL_METHOD(RecursiveIteratorIterator, endIteration) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } /* nothing to do */ } /* }}} */ @@ -769,7 +769,7 @@ SPL_METHOD(RecursiveIteratorIterator, callHasChildren) zval *zobject; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (!object->iterators) { @@ -798,7 +798,7 @@ SPL_METHOD(RecursiveIteratorIterator, callGetChildren) zval *zobject; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_SUB_ELEMENT(ce, object, ce); @@ -819,7 +819,7 @@ SPL_METHOD(RecursiveIteratorIterator, callGetChildren) SPL_METHOD(RecursiveIteratorIterator, beginChildren) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } /* nothing to do */ } /* }}} */ @@ -829,7 +829,7 @@ SPL_METHOD(RecursiveIteratorIterator, beginChildren) SPL_METHOD(RecursiveIteratorIterator, endChildren) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } /* nothing to do */ } /* }}} */ @@ -839,7 +839,7 @@ SPL_METHOD(RecursiveIteratorIterator, endChildren) SPL_METHOD(RecursiveIteratorIterator, nextElement) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } /* nothing to do */ } /* }}} */ @@ -852,7 +852,7 @@ SPL_METHOD(RecursiveIteratorIterator, setMaxDepth) zend_long max_depth = -1; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &max_depth) == FAILURE) { - return; + RETURN_THROWS(); } if (max_depth < -1) { zend_throw_exception(spl_ce_OutOfRangeException, "Parameter max_depth must be >= -1", 0); @@ -871,7 +871,7 @@ SPL_METHOD(RecursiveIteratorIterator, getMaxDepth) spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (object->max_depth == -1) { @@ -1101,7 +1101,7 @@ SPL_METHOD(RecursiveTreeIterator, setPrefixPart) spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); if (zend_parse_parameters(ZEND_NUM_ARGS(), "ls", &part, &prefix, &prefix_len) == FAILURE) { - return; + RETURN_THROWS(); } if (0 > part || part > 5) { @@ -1120,7 +1120,7 @@ SPL_METHOD(RecursiveTreeIterator, getPrefix) spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if(!object->iterators) { @@ -1141,7 +1141,7 @@ SPL_METHOD(RecursiveTreeIterator, setPostfix) size_t postfix_len; if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &postfix, &postfix_len) == FAILURE) { - return; + RETURN_THROWS(); } smart_str_free(&object->postfix[0]); @@ -1155,7 +1155,7 @@ SPL_METHOD(RecursiveTreeIterator, getEntry) spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if(!object->iterators) { @@ -1174,7 +1174,7 @@ SPL_METHOD(RecursiveTreeIterator, getPostfix) spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if(!object->iterators) { @@ -1196,7 +1196,7 @@ SPL_METHOD(RecursiveTreeIterator, current) zend_string *str; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if(!object->iterators) { @@ -1259,7 +1259,7 @@ SPL_METHOD(RecursiveTreeIterator, key) zend_string *str; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_SUB_ITERATOR(iterator, object); @@ -1560,7 +1560,7 @@ SPL_METHOD(dual_it, getInnerIterator) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -1663,7 +1663,7 @@ SPL_METHOD(dual_it, rewind) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -1682,7 +1682,7 @@ SPL_METHOD(dual_it, valid) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -1703,7 +1703,7 @@ SPL_METHOD(dual_it, key) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -1729,7 +1729,7 @@ SPL_METHOD(dual_it, current) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -1752,7 +1752,7 @@ SPL_METHOD(dual_it, next) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -1801,7 +1801,7 @@ SPL_METHOD(FilterIterator, rewind) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -1815,7 +1815,7 @@ SPL_METHOD(FilterIterator, next) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -1845,7 +1845,7 @@ SPL_METHOD(RecursiveFilterIterator, hasChildren) zval retval; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -1866,7 +1866,7 @@ SPL_METHOD(RecursiveFilterIterator, getChildren) zval retval; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -1886,7 +1886,7 @@ SPL_METHOD(RecursiveCallbackFilterIterator, getChildren) zval retval; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -1921,7 +1921,7 @@ SPL_METHOD(CallbackFilterIterator, accept) zval params[3]; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (Z_TYPE(intern->current.data) == IS_UNDEF || Z_TYPE(intern->current.key) == IS_UNDEF) { @@ -1964,7 +1964,7 @@ SPL_METHOD(RegexIterator, accept) int rc; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -2053,7 +2053,7 @@ SPL_METHOD(RegexIterator, getRegex) spl_dual_it_object *intern = Z_SPLDUAL_IT_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_STR_COPY(intern->u.regex.regex); @@ -2066,7 +2066,7 @@ SPL_METHOD(RegexIterator, getMode) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -2082,7 +2082,7 @@ SPL_METHOD(RegexIterator, setMode) zend_long mode; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &mode) == FAILURE) { - return; + RETURN_THROWS(); } if (mode < 0 || mode >= REGIT_MODE_MAX) { @@ -2102,7 +2102,7 @@ SPL_METHOD(RegexIterator, getFlags) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -2118,7 +2118,7 @@ SPL_METHOD(RegexIterator, setFlags) zend_long flags; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &flags) == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -2133,7 +2133,7 @@ SPL_METHOD(RegexIterator, getPregFlags) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -2153,7 +2153,7 @@ SPL_METHOD(RegexIterator, setPregFlags) zend_long preg_flags; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &preg_flags) == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -2177,7 +2177,7 @@ SPL_METHOD(RecursiveRegexIterator, getChildren) zval retval; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -2205,7 +2205,7 @@ SPL_METHOD(RecursiveRegexIterator, accept) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -2502,7 +2502,7 @@ SPL_METHOD(LimitIterator, seek) zend_long pos; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &pos) == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -2655,7 +2655,7 @@ SPL_METHOD(CachingIterator, rewind) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -2670,7 +2670,7 @@ SPL_METHOD(CachingIterator, valid) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -2685,7 +2685,7 @@ SPL_METHOD(CachingIterator, next) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -2700,7 +2700,7 @@ SPL_METHOD(CachingIterator, hasNext) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -2752,7 +2752,7 @@ SPL_METHOD(CachingIterator, offsetSet) } if (zend_parse_parameters(ZEND_NUM_ARGS(), "Sz", &key, &value) == FAILURE) { - return; + RETURN_THROWS(); } Z_TRY_ADDREF_P(value); @@ -2776,7 +2776,7 @@ SPL_METHOD(CachingIterator, offsetGet) } if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &key) == FAILURE) { - return; + RETURN_THROWS(); } if ((value = zend_symtable_find(Z_ARRVAL(intern->u.caching.zcache), key)) == NULL) { @@ -2803,7 +2803,7 @@ SPL_METHOD(CachingIterator, offsetUnset) } if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &key) == FAILURE) { - return; + RETURN_THROWS(); } zend_symtable_del(Z_ARRVAL(intern->u.caching.zcache), key); @@ -2825,7 +2825,7 @@ SPL_METHOD(CachingIterator, offsetExists) } if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &key) == FAILURE) { - return; + RETURN_THROWS(); } RETURN_BOOL(zend_symtable_exists(Z_ARRVAL(intern->u.caching.zcache), key)); @@ -2839,7 +2839,7 @@ SPL_METHOD(CachingIterator, getCache) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -2860,7 +2860,7 @@ SPL_METHOD(CachingIterator, getFlags) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -2879,7 +2879,7 @@ SPL_METHOD(CachingIterator, setFlags) SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &flags) == FAILURE) { - return; + RETURN_THROWS(); } if (spl_cit_check_flags(flags) != SUCCESS) { @@ -2909,7 +2909,7 @@ SPL_METHOD(CachingIterator, count) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -2976,7 +2976,7 @@ SPL_METHOD(RecursiveCachingIterator, hasChildren) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -2991,7 +2991,7 @@ SPL_METHOD(RecursiveCachingIterator, getChildren) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -3051,7 +3051,7 @@ SPL_METHOD(NoRewindIterator, __construct) SPL_METHOD(NoRewindIterator, rewind) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } /* nothing to do */ } /* }}} */ @@ -3063,7 +3063,7 @@ SPL_METHOD(NoRewindIterator, valid) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -3077,7 +3077,7 @@ SPL_METHOD(NoRewindIterator, key) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -3097,7 +3097,7 @@ SPL_METHOD(NoRewindIterator, current) zval *data; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -3114,7 +3114,7 @@ SPL_METHOD(NoRewindIterator, next) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -3150,7 +3150,7 @@ SPL_METHOD(InfiniteIterator, next) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -3177,7 +3177,7 @@ static const zend_function_entry spl_funcs_InfiniteIterator[] = { SPL_METHOD(EmptyIterator, rewind) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } } /* }}} */ @@ -3186,7 +3186,7 @@ SPL_METHOD(EmptyIterator, rewind) SPL_METHOD(EmptyIterator, valid) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_FALSE; } /* }}} */ @@ -3196,7 +3196,7 @@ SPL_METHOD(EmptyIterator, valid) SPL_METHOD(EmptyIterator, key) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } zend_throw_exception(spl_ce_BadMethodCallException, "Accessing the key of an EmptyIterator", 0); } /* }}} */ @@ -3206,7 +3206,7 @@ SPL_METHOD(EmptyIterator, key) SPL_METHOD(EmptyIterator, current) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } zend_throw_exception(spl_ce_BadMethodCallException, "Accessing the value of an EmptyIterator", 0); } /* }}} */ @@ -3216,7 +3216,7 @@ SPL_METHOD(EmptyIterator, current) SPL_METHOD(EmptyIterator, next) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } } /* }}} */ @@ -3292,7 +3292,7 @@ SPL_METHOD(AppendIterator, append) SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &it, zend_ce_iterator) == FAILURE) { - return; + RETURN_THROWS(); } if (intern->u.append.iterator->funcs->valid(intern->u.append.iterator) == SUCCESS && spl_dual_it_valid(intern) != SUCCESS) { spl_array_iterator_append(&intern->u.append.zarrayit, it); @@ -3319,7 +3319,7 @@ SPL_METHOD(AppendIterator, current) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -3341,7 +3341,7 @@ SPL_METHOD(AppendIterator, rewind) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -3359,7 +3359,7 @@ SPL_METHOD(AppendIterator, valid) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -3374,7 +3374,7 @@ SPL_METHOD(AppendIterator, next) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -3389,7 +3389,7 @@ SPL_METHOD(AppendIterator, getIteratorIndex) spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -3406,7 +3406,7 @@ SPL_METHOD(AppendIterator, getArrayIterator) zval *value; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); @@ -3526,7 +3526,7 @@ PHP_FUNCTION(iterator_to_array) zend_bool use_keys = 1; if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|b", &obj, zend_ce_traversable, &use_keys) == FAILURE) { - return; + RETURN_THROWS(); } array_init(return_value); @@ -3548,7 +3548,7 @@ PHP_FUNCTION(iterator_count) zend_long count = 0; if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &obj, zend_ce_traversable) == FAILURE) { - return; + RETURN_THROWS(); } if (spl_iterator_apply(obj, spl_iterator_count_apply, (void*)&count) == FAILURE) { @@ -3589,7 +3589,7 @@ PHP_FUNCTION(iterator_apply) apply_info.args = NULL; if (zend_parse_parameters(ZEND_NUM_ARGS(), "Of|a!", &apply_info.obj, zend_ce_traversable, &apply_info.fci, &apply_info.fcc, &apply_info.args) == FAILURE) { - return; + RETURN_THROWS(); } apply_info.count = 0; diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c index 8c9a8b0dd0..256c592387 100644 --- a/ext/spl/spl_observer.c +++ b/ext/spl/spl_observer.c @@ -399,7 +399,7 @@ SPL_METHOD(SplObjectStorage, attach) spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); if (zend_parse_parameters(ZEND_NUM_ARGS(), "o|z!", &obj, &inf) == FAILURE) { - return; + RETURN_THROWS(); } spl_object_storage_attach(intern, obj, inf); } /* }}} */ @@ -412,7 +412,7 @@ SPL_METHOD(SplObjectStorage, detach) spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &obj) == FAILURE) { - return; + RETURN_THROWS(); } spl_object_storage_detach(intern, obj); @@ -427,7 +427,7 @@ SPL_METHOD(SplObjectStorage, getHash) zval *obj; if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &obj) == FAILURE) { - return; + RETURN_THROWS(); } RETURN_NEW_STR(php_spl_object_hash(obj)); @@ -444,7 +444,7 @@ SPL_METHOD(SplObjectStorage, offsetGet) zend_hash_key key; if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &obj) == FAILURE) { - return; + RETURN_THROWS(); } if (spl_object_storage_get_hash(&key, intern, obj) == FAILURE) { @@ -472,7 +472,7 @@ SPL_METHOD(SplObjectStorage, addAll) spl_SplObjectStorage *other; if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &obj, spl_ce_SplObjectStorage) == FAILURE) { - return; + RETURN_THROWS(); } other = Z_SPLOBJSTORAGE_P(obj); @@ -492,7 +492,7 @@ SPL_METHOD(SplObjectStorage, removeAll) spl_SplObjectStorageElement *element; if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &obj, spl_ce_SplObjectStorage) == FAILURE) { - return; + RETURN_THROWS(); } other = Z_SPLOBJSTORAGE_P(obj); @@ -520,7 +520,7 @@ SPL_METHOD(SplObjectStorage, removeAllExcept) spl_SplObjectStorageElement *element; if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &obj, spl_ce_SplObjectStorage) == FAILURE) { - return; + RETURN_THROWS(); } other = Z_SPLOBJSTORAGE_P(obj); @@ -546,7 +546,7 @@ SPL_METHOD(SplObjectStorage, contains) spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &obj) == FAILURE) { - return; + RETURN_THROWS(); } RETURN_BOOL(spl_object_storage_contains(intern, obj)); } /* }}} */ @@ -559,7 +559,7 @@ SPL_METHOD(SplObjectStorage, count) zend_long mode = COUNT_NORMAL; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &mode) == FAILURE) { - return; + RETURN_THROWS(); } if (mode == COUNT_RECURSIVE) { @@ -585,7 +585,7 @@ SPL_METHOD(SplObjectStorage, rewind) spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } zend_hash_internal_pointer_reset_ex(&intern->storage, &intern->pos); @@ -599,7 +599,7 @@ SPL_METHOD(SplObjectStorage, valid) spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_BOOL(zend_hash_has_more_elements_ex(&intern->storage, &intern->pos) == SUCCESS); @@ -612,7 +612,7 @@ SPL_METHOD(SplObjectStorage, key) spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(intern->index); @@ -626,7 +626,7 @@ SPL_METHOD(SplObjectStorage, current) spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if ((element = zend_hash_get_current_data_ptr_ex(&intern->storage, &intern->pos)) == NULL) { @@ -643,7 +643,7 @@ SPL_METHOD(SplObjectStorage, getInfo) spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if ((element = zend_hash_get_current_data_ptr_ex(&intern->storage, &intern->pos)) == NULL) { @@ -661,7 +661,7 @@ SPL_METHOD(SplObjectStorage, setInfo) zval *inf; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &inf) == FAILURE) { - return; + RETURN_THROWS(); } if ((element = zend_hash_get_current_data_ptr_ex(&intern->storage, &intern->pos)) == NULL) { @@ -678,7 +678,7 @@ SPL_METHOD(SplObjectStorage, next) spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } zend_hash_move_forward_ex(&intern->storage, &intern->pos); @@ -698,7 +698,7 @@ SPL_METHOD(SplObjectStorage, serialize) smart_str buf = {0}; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } PHP_VAR_SERIALIZE_INIT(var_hash); @@ -757,7 +757,7 @@ SPL_METHOD(SplObjectStorage, unserialize) zend_long count; if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &buf, &buf_len) == FAILURE) { - return; + RETURN_THROWS(); } if (buf_len == 0) { @@ -878,7 +878,7 @@ SPL_METHOD(SplObjectStorage, __serialize) zval tmp; if (zend_parse_parameters_none_throw() == FAILURE) { - return; + RETURN_THROWS(); } array_init(return_value); @@ -907,7 +907,7 @@ SPL_METHOD(SplObjectStorage, __unserialize) zval *storage_zv, *members_zv, *key, *val; if (zend_parse_parameters(ZEND_NUM_ARGS(), "h", &data) == FAILURE) { - return; + RETURN_THROWS(); } storage_zv = zend_hash_index_find(data, 0); @@ -1019,7 +1019,7 @@ SPL_METHOD(MultipleIterator, __construct) zend_long flags = MIT_NEED_ALL|MIT_KEYS_NUMERIC; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &flags) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); @@ -1034,7 +1034,7 @@ SPL_METHOD(MultipleIterator, getFlags) spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(intern->flags); } @@ -1048,7 +1048,7 @@ SPL_METHOD(MultipleIterator, setFlags) intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &intern->flags) == FAILURE) { - return; + RETURN_THROWS(); } } /* }}} */ @@ -1061,7 +1061,7 @@ SPL_METHOD(MultipleIterator, attachIterator) zval *iterator = NULL, *info = NULL; if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|z!", &iterator, zend_ce_iterator, &info) == FAILURE) { - return; + RETURN_THROWS(); } intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); @@ -1099,7 +1099,7 @@ SPL_METHOD(MultipleIterator, rewind) intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } zend_hash_internal_pointer_reset_ex(&intern->storage, &intern->pos); @@ -1122,7 +1122,7 @@ SPL_METHOD(MultipleIterator, next) intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } zend_hash_internal_pointer_reset_ex(&intern->storage, &intern->pos); @@ -1146,7 +1146,7 @@ SPL_METHOD(MultipleIterator, valid) intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } if (!zend_hash_num_elements(&intern->storage)) { @@ -1254,7 +1254,7 @@ SPL_METHOD(MultipleIterator, current) intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } spl_multiple_iterator_get_all(intern, SPL_MULTIPLE_ITERATOR_GET_ALL_CURRENT, return_value); @@ -1269,7 +1269,7 @@ SPL_METHOD(MultipleIterator, key) intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } spl_multiple_iterator_get_all(intern, SPL_MULTIPLE_ITERATOR_GET_ALL_KEY, return_value); |