summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/opcache/tests/bug78429.phpt13
-rw-r--r--ext/opcache/zend_accelerator_module.c5
2 files changed, 18 insertions, 0 deletions
diff --git a/ext/opcache/tests/bug78429.phpt b/ext/opcache/tests/bug78429.phpt
new file mode 100644
index 0000000000..d2d1e43cdc
--- /dev/null
+++ b/ext/opcache/tests/bug78429.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Bug #78429 (opcache_compile_file(__FILE__); segfaults)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--INI--
+opcache.enable_cli=0
+--FILE--
+<?php
+var_dump(opcache_compile_file(__FILE__));
+?>
+--EXPECTF--
+Notice: Zend OPcache has not been properly started, can't compile file in %s on line %d
+bool(false)
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index 643f1d6cd0..9faec50386 100644
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@ -867,6 +867,11 @@ static ZEND_FUNCTION(opcache_compile_file)
return;
}
+ if (!accel_startup_ok) {
+ zend_error(E_NOTICE, ACCELERATOR_PRODUCT_NAME " has not been properly started, can't compile file");
+ RETURN_FALSE;
+ }
+
zend_stream_init_filename(&handle, script_name);
orig_execute_data = EG(current_execute_data);