com php-src: Destroy error handlers before final GC run: Zend/zend_execute_API.c
| From: | Nikita Popov | Date: | Wed, 28 Aug 2019 15:04:35 +0000 |
| Subject: | com php-src: Destroy error handlers before final GC run: Zend/zend_execute_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-108111@lists.php.net to get a copy of this message | ||
Commit: 2709d6a2508abfdda1b84f0426ae644c703180ed
Author: Nikita Popov <nikita.ppv@gmail.com> Wed, 28 Aug 2019 15:33:51 +0200
Parents: ec9a96dc60c3fd2cccf5b21033a0e87807366bdb
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2709d6a2508abfdda1b84f0426ae644c703180ed
Log:
Destroy error handlers before final GC run
Changed paths:
M Zend/zend_execute_API.c
Diff:
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index ac2ee8e..210817f 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -318,6 +318,21 @@ void shutdown_executor(void) /* {{{ */
}
} ZEND_HASH_FOREACH_END();
+ /* Also release error and exception handlers, which may hold objects. */
+ if (Z_TYPE(EG(user_error_handler)) != IS_UNDEF) {
+ zval_ptr_dtor(&EG(user_error_handler));
+ ZVAL_UNDEF(&EG(user_error_handler));
+ }
+
+ if (Z_TYPE(EG(user_exception_handler)) != IS_UNDEF) {
+ zval_ptr_dtor(&EG(user_exception_handler));
+ ZVAL_UNDEF(&EG(user_exception_handler));
+ }
+
+ zend_stack_clean(&EG(user_error_handlers_error_reporting), NULL, 1);
+ zend_stack_clean(&EG(user_error_handlers), (void (*)(void *))ZVAL_PTR_DTOR, 1);
+ zend_stack_clean(&EG(user_exception_handlers), (void (*)(void *))ZVAL_PTR_DTOR, 1);
+
#if ZEND_DEBUG
if (gc_enabled() && !CG(unclean_shutdown)) {
gc_collect_cycles();
@@ -344,22 +359,6 @@ void shutdown_executor(void) /* {{{ */
zend_hash_discard(EG(class_table), EG(persistent_classes_count));
zend_cleanup_internal_classes();
} else {
- /* remove error handlers before destroying classes and functions,
- * so that if handler used some class, crash would not happen */
- if (Z_TYPE(EG(user_error_handler)) != IS_UNDEF) {
- zval_ptr_dtor(&EG(user_error_handler));
- ZVAL_UNDEF(&EG(user_error_handler));
- }
-
- if (Z_TYPE(EG(user_exception_handler)) != IS_UNDEF) {
- zval_ptr_dtor(&EG(user_exception_handler));
- ZVAL_UNDEF(&EG(user_exception_handler));
- }
-
- zend_stack_clean(&EG(user_error_handlers_error_reporting), NULL, 1);
- zend_stack_clean(&EG(user_error_handlers), (void (*)(void *))ZVAL_PTR_DTOR, 1);
- zend_stack_clean(&EG(user_exception_handlers), (void (*)(void *))ZVAL_PTR_DTOR, 1);
-
zend_vm_stack_destroy();
if (EG(full_tables_cleanup)) {