Fixed bug #74596 (SIGSEGV with opcache.revalidate_path enabled)

laruence · laruence · commit 89dd7fb32858 · 2017-05-16T13:22:08.000+08:00
Yeah, no test script is provided.. I got some troubles to make a one
diff --git a/NEWS b/NEWS
@@ -13,6 +13,9 @@ PHP                                                                        NEWS
   . Fixed bug #74547 (mysqli::change_user() doesn't accept null as $database
     argument w/strict_types). (Anatol)
 
+- Opcache:
+  . Fixed bug #74596 (SIGSEGV with opcache.revalidate_path enabled). (Laruence)
+
 - phar:
   . Fixed bug #51918 (Phar::webPhar() does not handle requests sent through PUT
     and DELETE method). (Christian Weiske)
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -1706,7 +1706,10 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type)
 				return accelerator_orig_compile_file(file_handle, type);
 			}
 			persistent_script = zend_accel_hash_str_find(&ZCSG(hash), key, key_length);
+		} else if (UNEXPECTED(is_stream_path(file_handle->filename) && !is_cacheable_stream_path(file_handle->filename))) {
+			return accelerator_orig_compile_file(file_handle, type);
 		}
+
 		if (!persistent_script) {
 			/* try to find cached script by full real path */
 			zend_accel_hash_entry *bucket;

Original file line number	Diff line number	Diff line change
`@@ -1706,7 +1706,10 @@ zend_op_array persistent_compile_file(zend_file_handle file_handle, int type)`
`1706`	`1706`	`return accelerator_orig_compile_file(file_handle, type);`
`1707`	`1707`	`}`
`1708`	`1708`	`persistent_script = zend_accel_hash_str_find(&ZCSG(hash), key, key_length);`
	`1709`	`+ } else if (UNEXPECTED(is_stream_path(file_handle->filename) && !is_cacheable_stream_path(file_handle->filename))) {`
	`1710`	`+ return accelerator_orig_compile_file(file_handle, type);`
`1709`	`1711`	`}`
	`1712`	`+`
`1710`	`1713`	`if (!persistent_script) {`
`1711`	`1714`	`/* try to find cached script by full real path */`
`1712`	`1715`	`zend_accel_hash_entry *bucket;`