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

Merge branch 'PHP-8.0' into PHP-8.1

Browse source
This commit is contained in:
David Carlier 2022-10-23 00:46:25 +01:00
commit fe06c5ef60
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Zend/zend_exceptions.c
View file

@ -156,7 +156,8 @@ void zend_exception_restore(void) /* {{{ */
static zend_always_inline bool is_handle_exception_set(void) {
zend_execute_data *execute_data = EG(current_execute_data);
return !execute_data->func
return !execute_data
|| !execute_data->func
|| !ZEND_USER_CODE(execute_data->func->common.type)
|| execute_data->opline->opcode == ZEND_HANDLE_EXCEPTION;
}