archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Convert exception during inheritance to fatal error

Browse source 
Now that inheritance can throw deprecations again, these may be
converted to exception by a custom error handler. In this case
we need to convert the exception to a fatal error, as inheritance
cannot safely throw in the general case.
This commit is contained in:
Nikita Popov 2021-05-28 10:19:23 +02:00
parent 6e477d205e
commit 100a1e8e21
5 changed files with 43 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Zend/zend_inheritance.c
View file

@ -877,6 +877,10 @@ static void ZEND_COLD emit_incompatible_method_error(
zend_error_at(E_DEPRECATED, NULL, func_lineno(child),
"Declaration of %s should be compatible with %s",
ZSTR_VAL(child_prototype), ZSTR_VAL(parent_prototype));
if (EG(exception)) {
zend_exception_uncaught_error(
"During inheritance of %s", ZSTR_VAL(parent_scope->name));
}
}
} else {
zend_error_at(E_COMPILE_ERROR, NULL, func_lineno(child),
@ -2454,14 +2458,8 @@ static void check_unrecoverable_load_failure(zend_class_entry *ce) {
|| ((ce->ce_flags & ZEND_ACC_IMMUTABLE)
&& CG(unlinked_uses)
&& zend_hash_index_del(CG(unlinked_uses), (zend_long)(zend_uintptr_t)ce) == SUCCESS)) {
zend_string *exception_str;
zval exception_zv;
ZEND_ASSERT(EG(exception) && "Exception must have been thrown");
ZVAL_OBJ_COPY(&exception_zv, EG(exception));
zend_clear_exception();
exception_str = zval_get_string(&exception_zv);
zend_error_noreturn(E_ERROR,
"During inheritance of %s with variance dependencies: Uncaught %s", ZSTR_VAL(ce->name), ZSTR_VAL(exception_str));
zend_exception_uncaught_error(
"During inheritance of %s with variance dependencies", ZSTR_VAL(ce->name));
}
}