Fixed bug #81353

nikic · nikic · commit d1e956ff31f6 · 2021-08-16T15:04:17.000+02:00
A user-defined error handler should not be invoked for preload
warnings. We are in a partially shut-down state at that point.
diff --git a/NEWS b/NEWS
@@ -7,6 +7,10 @@ PHP                                                                        NEWS
   . Fixed bug #81346 (Non-seekable streams don't update position after write).
     (cmb)
 
+- Opcache:
+  . Fixed bug #81353 (segfault with preloading and statically bound closure).
+    (Nikita)
+
 - XML:
   . Fixed bug #81351 (xml_parse may fail, but has no error code). (cmb, Nikita)
 
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -4490,6 +4490,20 @@ static int accel_preload(const char *config)
 			}
 		} ZEND_HASH_FOREACH_END();
 
+		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);
+
 		CG(map_ptr_last) = orig_map_ptr_last;
 
 		if (EG(full_tables_cleanup)) {
diff --git a/ext/opcache/tests/preload_error_handler.inc b/ext/opcache/tests/preload_error_handler.inc
@@ -0,0 +1,8 @@
+<?php
+
+set_error_handler(function($_, $m) {
+    static $x;
+    var_dump($m);
+});
+
+opcache_compile_file(__DIR__ . '/preload_error_handler_ind.inc');
diff --git a/ext/opcache/tests/preload_error_handler.phpt b/ext/opcache/tests/preload_error_handler.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Bug #81353: Segfault with preloading and error handler using static variables
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.optimization_level=-1
+opcache.preload={PWD}/preload_error_handler.inc
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
+?>
+--FILE--
+===DONE===
+--EXPECTF--
+Warning: Can't preload unlinked class B: Unknown parent A in %s on line %d
+===DONE===
diff --git a/ext/opcache/tests/preload_error_handler_ind.inc b/ext/opcache/tests/preload_error_handler_ind.inc
@@ -0,0 +1,4 @@
+<?php
+
+// Cause a preload warning
+class B extends A {}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +<?php
++
 +// Cause a preload warning
 +class B extends A {}