Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable)

diff --git a/ext/opcache/Optimizer/pass1_5.c b/ext/opcache/Optimizer/pass1_5.c
index 5ab5bf400bd98d3fa7ce02f1bbc2c2f1b6fcc8c0..8f76c63d96694fc66b848904d2b929d51b8dccdc 100644 (file)
--- a/ext/opcache/Optimizer/pass1_5.c
+++ b/ext/opcache/Optimizer/pass1_5.c
@@ -274,7 +274,11 @@ if (ZEND_OPTIMIZER_PASS_1 & OPTIMIZATION_LEVEL) {
                                                                Z_STRVAL(op_array->literals[opline->op1.constant + 1].constant), 
                                                                Z_STRLEN(op_array->literals[opline->op1.constant].constant) + 1, 
                                                                Z_HASH_P(&op_array->literals[opline->op1.constant + 1].constant),
-                                                               (void **)&pce) == FAILURE) {
+                                                               (void **)&pce) == FAILURE ||
+                                                               ((*pce)->type == ZEND_INTERNAL_CLASS &&
+                                                                (*pce)->info.internal.module->type != MODULE_PERSISTENT) ||
+                                                               ((*pce)->type == ZEND_USER_CLASS &&
+                                                                ZEND_CE_FILENAME(*pce) != op_array->filename)) {
                                                        break;
                                                }
                                        }

diff --git a/ext/opcache/tests/bug66338.phpt b/ext/opcache/tests/bug66338.phpt
new file mode 100644 (file)
index 0000000..cf0018d
--- /dev/null
+++ b/ext/opcache/tests/bug66338.phpt
@@ -0,0 +1,42 @@
+--TEST--\r
+Bug #66338 (Optimization binding of class constants is not safely opcacheable)\r
+--INI--\r
+opcache.enable=0\r
+--SKIPIF--\r
+<?php if (!extension_loaded('Zend OPcache') || php_sapi_name() != "cli") die("skip CLI only"); ?>\r
+--FILE--\r
+<?php\r
+$root  = str_replace('.php', "", __FILE__);\r
+$base  = basename( $root );\r
+\r
+file_put_contents( "$root-Officials.inc", '<?php \r
+       class Officials { static function getLeader() { return LocalTerms::GOV_LEADER; } }\r
+       ' );\r
+\r
+file_put_contents( "$root-clientUS.php", '<?php \r
+       class LocalTerms { const GOV_LEADER = "Barack Hussein Obama II"; }\r
+       require "'.$root.'-Officials.inc";\r
+       printf( "The President of the USA is %s\n", Officials::getLeader() );\r
+       ' );\r
+\r
+file_put_contents( "$root-clientUK.php", '<?php \r
+       class LocalTerms { const GOV_LEADER = "David William Donald Cameron"; }\r
+       require "'.$root.'-Officials.inc";\r
+       printf( "The Prime Minister of the UK is %s\n", Officials::getLeader() );\r
+       ' );\r
+\r
+include "php_cli_server.inc";\r
+$uri = sprintf("http://%s/%s", PHP_CLI_SERVER_ADDRESS, basename(__FILE__));\r
+$opt = -1;   # This test works if $opt = 0\r
+php_cli_server_start("-d opcache.enable=1 -d opcache.enable_cli=1 -d opcache.optimization_level=$opt -d opcache.file_update_protection=0" );\r
+\r
+echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS . "/$base-clientUS.php" );\r
+echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS . "/$base-clientUK.php" );\r
+\r
+unlink("$root-Officials.inc");\r
+unlink("$root-clientUS.php");\r
+unlink("$root-clientUK.php");\r
+?>\r
+--EXPECT--\r
+The President of the USA is Barack Hussein Obama II\r
+The Prime Minister of the UK is David William Donald Cameron\r