com php-src: Converted most object handlers fatal errors into EngineExceptions: Zend/tests/exception_014.phpt Zen d/zend_object_handlers.c
Zend/zend_vm_def.h Zen d/zend_vm_execute.h

From: Date: Tue, 31 Mar 2015 21:37:59 +0000
Subject: com php-src: Converted most object handlers fatal errors into EngineExceptions: Zend/tests/exception_014.phpt Zen d/zend_object_handlers.c
Zend/zend_vm_def.h Zen d/zend_vm_execute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85978@lists.php.net to get a copy of this message
Commit: 2bf8f29d16e6875e65eaa538a9740aac31ce650a Author: Dmitry Stogov <dmitry@zend.com> Wed, 1 Apr 2015 00:37:59 +0300 Parents: 6ef9216269c0a42898feed90cec9fc4193cad9b6 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2bf8f29d16e6875e65eaa538a9740aac31ce650a Log: Converted most object handlers fatal errors into EngineExceptions Changed paths: A Zend/tests/exception_014.phpt M Zend/zend_object_handlers.c M Zend/zend_vm_def.h M Zend/zend_vm_execute.h

diff --git a/Zend/tests/exception_014.phpt b/Zend/tests/exception_014.phpt new file mode 100644 index 0000000..f210af6 --- /dev/null +++ b/Zend/tests/exception_014.phpt @@ -0,0 +1,21 @@ +--TEST-- +Exceptions on improper access to static class properties +--FILE-- +<?php +class C { + private $p = 0; +} + +$x = new C; +try { + var_dump($x->p); +} catch (EngineException $e) { + echo "\nException: " . $e->getMessage() . " in " , $e->getFile() . " on line " . $e->getLine() . "\n"; +} + +var_dump($x->p); +?> +--EXPECTF-- +Exception: Cannot access private property C::$p in /home/dmitry/php/php-master/Zend/tests/exception_014.php on line 8 + +Fatal error: Cannot access private property C::$p in /home/dmitry/php/php-master/Zend/tests/exception_014.php on line 13 diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 063c0a5..8dcd81a 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -170,7 +170,7 @@ ZEND_API HashTable *zend_std_get_debug_info(zval *object, int *is_temp) /* {{{ * return ht; } - zend_error_noreturn(E_ERROR, ZEND_DEBUGINFO_FUNC_NAME "() must return an array"); + zend_error(E_ERROR, ZEND_DEBUGINFO_FUNC_NAME "() must return an array"); return NULL; /* Compilers are dumb and don't understand that noreturn means that the function does NOT need a return value... */ } @@ -298,9 +298,9 @@ static zend_always_inline uint32_t zend_get_property_offset(zend_class_entry *ce if (UNEXPECTED(member->val[0] == '\0')) { if (!silent) { if (member->len == 0) { - zend_error_noreturn(E_ERROR, "Cannot access empty property"); + zend_error(E_EXCEPTION | E_ERROR, "Cannot access empty property"); } else { - zend_error_noreturn(E_ERROR, "Cannot access property started with '\\0'"); + zend_error(E_EXCEPTION | E_ERROR, "Cannot access property started with '\\0'"); } } return ZEND_WRONG_PROPERTY_OFFSET; @@ -354,7 +354,7 @@ exit_dynamic: } else if (UNEXPECTED(property_info == ZEND_WRONG_PROPERTY_INFO)) { /* Information was available, but we were denied access. Error out. */ if (!silent) { - zend_error_noreturn(E_ERROR, "Cannot access %s property %s::$%s", zend_visibility_string(flags), ce->name->val, member->val); + zend_error(E_EXCEPTION | E_ERROR, "Cannot access %s property %s::$%s", zend_visibility_string(flags), ce->name->val, member->val); } return ZEND_WRONG_PROPERTY_OFFSET; } @@ -376,9 +376,9 @@ ZEND_API zend_property_info *zend_get_property_info(zend_class_entry *ce, zend_s if (UNEXPECTED(member->val[0] == '\0')) { if (!silent) { if (member->len == 0) { - zend_error_noreturn(E_ERROR, "Cannot access empty property"); + zend_error(E_EXCEPTION | E_ERROR, "Cannot access empty property"); } else { - zend_error_noreturn(E_ERROR, "Cannot access property started with '\\0'"); + zend_error(E_EXCEPTION | E_ERROR, "Cannot access property started with '\\0'"); } } return ZEND_WRONG_PROPERTY_INFO; @@ -425,7 +425,7 @@ exit_dynamic: } else if (UNEXPECTED(property_info == ZEND_WRONG_PROPERTY_INFO)) { /* Information was available, but we were denied access. Error out. */ if (!silent) { - zend_error_noreturn(E_ERROR, "Cannot access %s property %s::$%s", zend_visibility_string(flags), ce->name->val, member->val); + zend_error(E_EXCEPTION | E_ERROR, "Cannot access %s property %s::$%s", zend_visibility_string(flags), ce->name->val, member->val); } return ZEND_WRONG_PROPERTY_INFO; } @@ -538,6 +538,9 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_ retval = zend_hash_find(zobj->properties, Z_STR_P(member)); if (EXPECTED(retval)) goto exit; } + } else if (UNEXPECTED(EG(exception))) { + retval = &EG(uninitialized_zval); + goto exit; } /* magic get */ @@ -569,9 +572,13 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_ } else { if (Z_STRVAL_P(member)[0] == '\0') { if (Z_STRLEN_P(member) == 0) { - zend_error(E_ERROR, "Cannot access empty property"); + zend_error(E_EXCEPTION | E_ERROR, "Cannot access empty property"); + retval = &EG(uninitialized_zval); + goto exit; } else { - zend_error(E_ERROR, "Cannot access property started with '\\0'"); + zend_error(E_EXCEPTION | E_ERROR, "Cannot access property started with '\\0'"); + retval = &EG(uninitialized_zval); + goto exit; } } } @@ -622,6 +629,8 @@ found: goto exit; } } + } else if (UNEXPECTED(EG(exception))) { + goto exit; } /* magic set */ @@ -643,9 +652,11 @@ found: } else { if (Z_STRVAL_P(member)[0] == '\0') { if (Z_STRLEN_P(member) == 0) { - zend_error(E_ERROR, "Cannot access empty property"); + zend_error(E_EXCEPTION | E_ERROR, "Cannot access empty property"); + goto exit; } else { - zend_error(E_ERROR, "Cannot access property started with '\\0'"); + zend_error(E_EXCEPTION | E_ERROR, "Cannot access property started with '\\0'"); + goto exit; } } } @@ -698,13 +709,13 @@ zval *zend_std_read_dimension(zval *object, zval *offset, int type, zval *rv) /* if (UNEXPECTED(Z_TYPE_P(rv) == IS_UNDEF)) { if (UNEXPECTED(!EG(exception))) { - zend_error_noreturn(E_ERROR, "Undefined offset for object of type %s used as array", ce->name->val); + zend_error(E_EXCEPTION | E_ERROR, "Undefined offset for object of type %s used as array", ce->name->val); } return NULL; } return rv; } else { - zend_error_noreturn(E_ERROR, "Cannot use object of type %s as array", ce->name->val); + zend_error(E_EXCEPTION | E_ERROR, "Cannot use object of type %s as array", ce->name->val); return NULL; } } @@ -725,7 +736,7 @@ static void zend_std_write_dimension(zval *object, zval *offset, zval *value) /* zend_call_method_with_2_params(object, ce, NULL, "offsetset", NULL, offset, value); zval_ptr_dtor(offset); } else { - zend_error_noreturn(E_ERROR, "Cannot use object of type %s as array", ce->name->val); + zend_error(E_EXCEPTION | E_ERROR, "Cannot use object of type %s as array", ce->name->val); } } /* }}} */ @@ -754,7 +765,7 @@ static int zend_std_has_dimension(zval *object, zval *offset, int check_empty) / } zval_ptr_dtor(offset); } else { - zend_error_noreturn(E_ERROR, "Cannot use object of type %s as array", ce->name->val); + zend_error(E_EXCEPTION | E_ERROR, "Cannot use object of type %s as array", ce->name->val); return 0; } return result; @@ -854,6 +865,8 @@ static void zend_std_unset_property(zval *object, zval *member, void **cache_slo EXPECTED(zend_hash_del(zobj->properties, Z_STR_P(member)) != FAILURE)) { goto exit; } + } else if (UNEXPECTED(EG(exception))) { + goto exit; } /* magic unset */ @@ -871,9 +884,11 @@ static void zend_std_unset_property(zval *object, zval *member, void **cache_slo } else { if (Z_STRVAL_P(member)[0] == '\0') { if (Z_STRLEN_P(member) == 0) { - zend_error(E_ERROR, "Cannot access empty property"); + zend_error(E_EXCEPTION | E_ERROR, "Cannot access empty property"); + goto exit; } else { - zend_error(E_ERROR, "Cannot access property started with '\\0'"); + zend_error(E_EXCEPTION | E_ERROR, "Cannot access property started with '\\0'"); + goto exit; } } } @@ -895,7 +910,7 @@ static void zend_std_unset_dimension(zval *object, zval *offset) /* {{{ */ zend_call_method_with_1_params(object, ce, NULL, "offsetunset", NULL, offset); zval_ptr_dtor(offset); } else { - zend_error_noreturn(E_ERROR, "Cannot use object of type %s as array", ce->name->val); + zend_error(E_EXCEPTION | E_ERROR, "Cannot use object of type %s as array", ce->name->val); } } /* }}} */ @@ -911,7 +926,7 @@ ZEND_API void zend_std_call_user_call(INTERNAL_FUNCTION_PARAMETERS) /* {{{ */ if (UNEXPECTED(zend_copy_parameters_array(ZEND_NUM_ARGS(), &method_args) == FAILURE)) { zval_dtor(&method_args); - zend_error_noreturn(E_ERROR, "Cannot get arguments for __call"); + zend_error(E_EXCEPTION | E_ERROR, "Cannot get arguments for __call"); RETURN_FALSE; } @@ -1085,7 +1100,8 @@ static union _zend_function *zend_std_get_method(zend_object **obj_ptr, zend_str if (zobj->ce->__call) { fbc = zend_get_user_call_function(zobj->ce, method_name); } else { - zend_error_noreturn(E_ERROR, "Call to %s method %s::%s() from context '%s'", zend_visibility_string(fbc->common.fn_flags), ZEND_FN_SCOPE_NAME(fbc), method_name->val, EG(scope) ? EG(scope)->name->val : ""); + zend_error(E_EXCEPTION | E_ERROR, "Call to %s method %s::%s() from context '%s'", zend_visibility_string(fbc->common.fn_flags), ZEND_FN_SCOPE_NAME(fbc), method_name->val, EG(scope) ? EG(scope)->name->val : ""); + fbc = NULL; } } } else { @@ -1111,7 +1127,8 @@ static union _zend_function *zend_std_get_method(zend_object **obj_ptr, zend_str if (zobj->ce->__call) { fbc = zend_get_user_call_function(zobj->ce, method_name); } else { - zend_error_noreturn(E_ERROR, "Call to %s method %s::%s() from context '%s'", zend_visibility_string(fbc->common.fn_flags), ZEND_FN_SCOPE_NAME(fbc), method_name->val, EG(scope) ? EG(scope)->name->val : ""); + zend_error(E_EXCEPTION | E_ERROR, "Call to %s method %s::%s() from context '%s'", zend_visibility_string(fbc->common.fn_flags), ZEND_FN_SCOPE_NAME(fbc), method_name->val, EG(scope) ? EG(scope)->name->val : ""); + fbc = NULL; } } } @@ -1135,7 +1152,7 @@ ZEND_API void zend_std_callstatic_user_call(INTERNAL_FUNCTION_PARAMETERS) /* {{{ if (UNEXPECTED(zend_copy_parameters_array(ZEND_NUM_ARGS(), &method_args) == FAILURE)) { zval_dtor(&method_args); - zend_error_noreturn(E_ERROR, "Cannot get arguments for " ZEND_CALLSTATIC_FUNC_NAME); + zend_error(E_EXCEPTION | E_ERROR, "Cannot get arguments for " ZEND_CALLSTATIC_FUNC_NAME); RETURN_FALSE; } @@ -1252,7 +1269,8 @@ ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce, zend_st if (ce->__callstatic) { fbc = zend_get_user_callstatic_function(ce, function_name); } else { - zend_error_noreturn(E_ERROR, "Call to %s method %s::%s() from context '%s'", zend_visibility_string(fbc->common.fn_flags), ZEND_FN_SCOPE_NAME(fbc), function_name->val, EG(scope) ? EG(scope)->name->val : ""); + zend_error(E_EXCEPTION | E_ERROR, "Call to %s method %s::%s() from context '%s'", zend_visibility_string(fbc->common.fn_flags), ZEND_FN_SCOPE_NAME(fbc), function_name->val, EG(scope) ? EG(scope)->name->val : ""); + fbc = NULL; } } } else if ((fbc->common.fn_flags & ZEND_ACC_PROTECTED)) { @@ -1262,7 +1280,8 @@ ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce, zend_st if (ce->__callstatic) { fbc = zend_get_user_callstatic_function(ce, function_name); } else { - zend_error_noreturn(E_ERROR, "Call to %s method %s::%s() from context '%s'", zend_visibility_string(fbc->common.fn_flags), ZEND_FN_SCOPE_NAME(fbc), function_name->val, EG(scope) ? EG(scope)->name->val : ""); + zend_error(E_EXCEPTION | E_ERROR, "Call to %s method %s::%s() from context '%s'", zend_visibility_string(fbc->common.fn_flags), ZEND_FN_SCOPE_NAME(fbc), function_name->val, EG(scope) ? EG(scope)->name->val : ""); + fbc = NULL; } } } @@ -1330,9 +1349,11 @@ ZEND_API union _zend_function *zend_std_get_constructor(zend_object *zobj) /* {{ */ if (UNEXPECTED(constructor->common.scope != EG(scope))) { if (EG(scope)) { - zend_error_noreturn(E_ERROR, "Call to private %s::%s() from context '%s'", constructor->common.scope->name->val, constructor->common.function_name->val, EG(scope)->name->val); + zend_error(E_EXCEPTION | E_ERROR, "Call to private %s::%s() from context '%s'", constructor->common.scope->name->val, constructor->common.function_name->val, EG(scope)->name->val); + constructor = NULL; } else { - zend_error_noreturn(E_ERROR, "Call to private %s::%s() from invalid context", constructor->common.scope->name->val, constructor->common.function_name->val); + zend_error(E_EXCEPTION | E_ERROR, "Call to private %s::%s() from invalid context", constructor->common.scope->name->val, constructor->common.function_name->val); + constructor = NULL; } } } else if ((constructor->common.fn_flags & ZEND_ACC_PROTECTED)) { @@ -1342,9 +1363,11 @@ ZEND_API union _zend_function *zend_std_get_constructor(zend_object *zobj) /* {{ */ if (UNEXPECTED(!zend_check_protected(zend_get_function_root_class(constructor), EG(scope)))) { if (EG(scope)) { - zend_error_noreturn(E_ERROR, "Call to protected %s::%s() from context '%s'", constructor->common.scope->name->val, constructor->common.function_name->val, EG(scope)->name->val); + zend_error(E_EXCEPTION | E_ERROR, "Call to protected %s::%s() from context '%s'", constructor->common.scope->name->val, constructor->common.function_name->val, EG(scope)->name->val); + constructor = NULL; } else { - zend_error_noreturn(E_ERROR, "Call to protected %s::%s() from invalid context", constructor->common.scope->name->val, constructor->common.function_name->val); + zend_error(E_EXCEPTION | E_ERROR, "Call to protected %s::%s() from invalid context", constructor->common.scope->name->val, constructor->common.function_name->val); + constructor = NULL; } } } @@ -1456,6 +1479,9 @@ found: } goto exit; } + } else if (UNEXPECTED(EG(exception))) { + result = 0; + goto exit; } result = 0; diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 338e4c9..6660376 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2805,7 +2805,9 @@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, TMPVAR|UNUSED|CV, CONST|TMPVAR|CV) /* First, locate the function. */ fbc = obj->handlers->get_method(&obj, Z_STR_P(function_name), ((OP2_TYPE == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + } FREE_OP2(); FREE_OP1(); HANDLE_EXCEPTION(); @@ -2892,7 +2894,9 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, CONST|VAR, CONST|TMPVAR|UNUSE fbc = zend_std_get_static_method(ce, Z_STR_P(function_name), ((OP2_TYPE == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); } if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name)); + } FREE_OP2(); HANDLE_EXCEPTION(); } @@ -3079,7 +3083,9 @@ ZEND_VM_C_LABEL(try_function_name): fbc = zend_std_get_static_method(called_scope, Z_STR_P(method), NULL); } if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", called_scope->name->val, Z_STRVAL_P(method)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", called_scope->name->val, Z_STRVAL_P(method)); + } FREE_OP2(); HANDLE_EXCEPTION(); } @@ -3103,7 +3109,9 @@ ZEND_VM_C_LABEL(try_function_name): fbc = Z_OBJ_HT_P(obj)->get_method(&object, Z_STR_P(method), NULL); if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", object->ce->name->val, Z_STRVAL_P(method)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", object->ce->name->val, Z_STRVAL_P(method)); + } FREE_OP2(); HANDLE_EXCEPTION(); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 98e27d8..a4c2f35 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1950,7 +1950,9 @@ try_function_name: fbc = zend_std_get_static_method(called_scope, Z_STR_P(method), NULL); } if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", called_scope->name->val, Z_STRVAL_P(method)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", called_scope->name->val, Z_STRVAL_P(method)); + } HANDLE_EXCEPTION(); } @@ -1974,7 +1976,9 @@ try_function_name: fbc = Z_OBJ_HT_P(obj)->get_method(&object, Z_STR_P(method), NULL); if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", object->ce->name->val, Z_STRVAL_P(method)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", object->ce->name->val, Z_STRVAL_P(method)); + } HANDLE_EXCEPTION(); } @@ -2338,7 +2342,9 @@ try_function_name: fbc = zend_std_get_static_method(called_scope, Z_STR_P(method), NULL); } if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", called_scope->name->val, Z_STRVAL_P(method)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", called_scope->name->val, Z_STRVAL_P(method)); + } HANDLE_EXCEPTION(); } @@ -2362,7 +2368,9 @@ try_function_name: fbc = Z_OBJ_HT_P(obj)->get_method(&object, Z_STR_P(method), NULL); if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", object->ce->name->val, Z_STRVAL_P(method)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", object->ce->name->val, Z_STRVAL_P(method)); + } HANDLE_EXCEPTION(); } @@ -2523,7 +2531,9 @@ try_function_name: fbc = zend_std_get_static_method(called_scope, Z_STR_P(method), NULL); } if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", called_scope->name->val, Z_STRVAL_P(method)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", called_scope->name->val, Z_STRVAL_P(method)); + } zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } @@ -2547,7 +2557,9 @@ try_function_name: fbc = Z_OBJ_HT_P(obj)->get_method(&object, Z_STR_P(method), NULL); if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", object->ce->name->val, Z_STRVAL_P(method)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", object->ce->name->val, Z_STRVAL_P(method)); + } zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } @@ -5024,7 +5036,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C fbc = zend_std_get_static_method(ce, Z_STR_P(function_name), ((IS_CONST == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); } if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name)); + } HANDLE_EXCEPTION(); } @@ -6950,7 +6964,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C fbc = zend_std_get_static_method(ce, Z_STR_P(function_name), ((IS_UNUSED == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); } if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name)); + } HANDLE_EXCEPTION(); } @@ -8436,7 +8452,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C fbc = zend_std_get_static_method(ce, Z_STR_P(function_name), ((IS_CV == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); } if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name)); + } HANDLE_EXCEPTION(); } @@ -9985,7 +10003,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C fbc = zend_std_get_static_method(ce, Z_STR_P(function_name), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); } if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name)); + } zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } @@ -15850,7 +15870,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V fbc = zend_std_get_static_method(ce, Z_STR_P(function_name), ((IS_CONST == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); } if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name)); + } HANDLE_EXCEPTION(); } @@ -17425,7 +17447,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V fbc = zend_std_get_static_method(ce, Z_STR_P(function_name), ((IS_UNUSED == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); } if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name)); + } HANDLE_EXCEPTION(); } @@ -19042,7 +19066,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V fbc = zend_std_get_static_method(ce, Z_STR_P(function_name), ((IS_CV == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); } if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name)); + } HANDLE_EXCEPTION(); } @@ -20601,7 +20627,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V fbc = zend_std_get_static_method(ce, Z_STR_P(function_name), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); } if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name)); + } zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } @@ -21960,7 +21988,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_C /* First, locate the function. */ fbc = obj->handlers->get_method(&obj, Z_STR_P(function_name), ((IS_CONST == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + } HANDLE_EXCEPTION(); @@ -24248,7 +24278,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_C /* First, locate the function. */ fbc = obj->handlers->get_method(&obj, Z_STR_P(function_name), ((IS_CV == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + } HANDLE_EXCEPTION(); @@ -25657,7 +25689,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_T /* First, locate the function. */ fbc = obj->handlers->get_method(&obj, Z_STR_P(function_name), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + } zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); @@ -29613,7 +29647,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CONST /* First, locate the function. */ fbc = obj->handlers->get_method(&obj, Z_STR_P(function_name), ((IS_CONST == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + } HANDLE_EXCEPTION(); @@ -34451,7 +34487,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HA /* First, locate the function. */ fbc = obj->handlers->get_method(&obj, Z_STR_P(function_name), ((IS_CV == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + } HANDLE_EXCEPTION(); @@ -36866,7 +36904,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_TMPVA /* First, locate the function. */ fbc = obj->handlers->get_method(&obj, Z_STR_P(function_name), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + } zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); @@ -38882,7 +38922,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_C /* First, locate the function. */ fbc = obj->handlers->get_method(&obj, Z_STR_P(function_name), ((IS_CONST == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + } zval_ptr_dtor_nogc(free_op1); HANDLE_EXCEPTION(); @@ -40867,7 +40909,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_C /* First, locate the function. */ fbc = obj->handlers->get_method(&obj, Z_STR_P(function_name), ((IS_CV == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + } zval_ptr_dtor_nogc(free_op1); HANDLE_EXCEPTION(); @@ -41857,7 +41901,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_T /* First, locate the function. */ fbc = obj->handlers->get_method(&obj, Z_STR_P(function_name), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? (EX_CONSTANT(opline->op2) + 1) : NULL)); if (UNEXPECTED(fbc == NULL)) { - zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + if (EXPECTED(!EG(exception))) { + zend_error(E_EXCEPTION | E_ERROR, "Call to undefined method %s::%s()", obj->ce->name->val, Z_STRVAL_P(function_name)); + } zval_ptr_dtor_nogc(free_op2); zval_ptr_dtor_nogc(free_op1); HANDLE_EXCEPTION();
« previous php.cvs (#85978) next »