Report parse errors during preloading

php · Nov 3, 2020 · b009573 · b009573
1 parent 9fd8e00
commit b009573
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -4480,6 +4480,10 @@ static int accel_preload(const char *config, zend_bool in_child)
 			destroy_op_array(op_array);
 			efree_size(op_array, sizeof(zend_op_array));
 		} else {
+			if (EG(exception)) {
+				zend_exception_error(EG(exception), E_ERROR);
+			}
+
 			CG(unclean_shutdown) = 1;
 			ret = FAILURE;
 		}

diff --git a/ext/opcache/tests/preload_parse_error.inc b/ext/opcache/tests/preload_parse_error.inc
@@ -0,0 +1,2 @@
+<?php
+parse error
diff --git a/ext/opcache/tests/preload_parse_error.phpt b/ext/opcache/tests/preload_parse_error.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Parse error in preload script
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.optimization_level=-1
+opcache.preload={PWD}/preload_parse_error.inc
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
+?>
+--FILE--
+OK
+--EXPECTF--
+Parse error: syntax error, unexpected identifier "error" in %s on line %d