diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-15 12:49:50 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-15 12:49:50 +0200 |
| commit | 5063a7085cbcd49eccb838bc1eb94e01776fa154 (patch) | |
| tree | eae81c6c42b3e680a5d2a2e7f84795a9956cda13 | |
| parent | 63761822bbe4219a8b0aa28452d74d54221bf7ae (diff) | |
| parent | c666f6ec3b2f5102d6828da6302852d9b9e5b745 (diff) | |
| download | php-git-5063a7085cbcd49eccb838bc1eb94e01776fa154.tar.gz | |
Merge branch 'PHP-7.4'
| -rw-r--r-- | Zend/tests/bug49908.phpt | 12 | ||||
| -rw-r--r-- | Zend/zend_execute_API.c | 28 |
2 files changed, 29 insertions, 11 deletions
diff --git a/Zend/tests/bug49908.phpt b/Zend/tests/bug49908.phpt index eda913b80e..721d8a465c 100644 --- a/Zend/tests/bug49908.phpt +++ b/Zend/tests/bug49908.phpt @@ -13,18 +13,22 @@ spl_autoload_register(function ($className) { } }); -new Foo; +try { + new Foo(); +} catch (Exception $e) { } + +// We never reach here. +var_dump(new Foo()); ?> --EXPECTF-- string(3) "Foo" string(3) "Bar" -Fatal error: Uncaught Exception: Bar in %s:%d +Fatal error: During class fetch: Uncaught Exception: Bar in %s:%d Stack trace: #0 [internal function]: {closure}('Bar') #1 %s(%d): spl_autoload_call('Bar') #2 [internal function]: {closure}('Foo') #3 %s(%d): spl_autoload_call('Foo') -#4 {main} - thrown in %s on line %d +#4 {main} in %s on line %d diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 550ec20c0c..5e8e2f467c 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1357,14 +1357,28 @@ zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, zend_string if (fetch_type & ZEND_FETCH_CLASS_NO_AUTOLOAD) { return zend_lookup_class_ex(class_name, key, 0); } else if ((ce = zend_lookup_class_ex(class_name, key, 1)) == NULL) { - if ((fetch_type & ZEND_FETCH_CLASS_SILENT) == 0 && !EG(exception)) { - if ((fetch_type & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_INTERFACE) { - zend_throw_or_error(fetch_type, NULL, "Interface '%s' not found", ZSTR_VAL(class_name)); - } else if ((fetch_type & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_TRAIT) { - zend_throw_or_error(fetch_type, NULL, "Trait '%s' not found", ZSTR_VAL(class_name)); - } else { - zend_throw_or_error(fetch_type, NULL, "Class '%s' not found", ZSTR_VAL(class_name)); + if (fetch_type & ZEND_FETCH_CLASS_SILENT) { + return NULL; + } + if (EG(exception)) { + if (!(fetch_type & ZEND_FETCH_CLASS_EXCEPTION)) { + zend_string *exception_str; + zval exception_zv; + ZVAL_OBJ(&exception_zv, EG(exception)); + Z_ADDREF(exception_zv); + zend_clear_exception(); + exception_str = zval_get_string(&exception_zv); + zend_error_noreturn(E_ERROR, + "During class fetch: Uncaught %s", ZSTR_VAL(exception_str)); } + return NULL; + } + if ((fetch_type & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_INTERFACE) { + zend_throw_or_error(fetch_type, NULL, "Interface '%s' not found", ZSTR_VAL(class_name)); + } else if ((fetch_type & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_TRAIT) { + zend_throw_or_error(fetch_type, NULL, "Trait '%s' not found", ZSTR_VAL(class_name)); + } else { + zend_throw_or_error(fetch_type, NULL, "Class '%s' not found", ZSTR_VAL(class_name)); } return NULL; } |