Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)

diff --git a/NEWS b/NEWS
index 07a9e7f864f2272c8afb0bf46f0fd4389cc5614e..ae9bd7259bfac45af26d959915e0fca3a49f4b14 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ PHP                                                                        NEWS
 - OPCache:
   . Fixed bug #66474 (Optimizer bug in constant string to boolean conversion).
     (Dmitry)
+  . Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0).
+    (Dmitry)
   . Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style 
     ^M as lineend). (Laruence)
 

diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 2e26170a072bc608b5c2595beb8261dba2c64d29..d02a538c527523f59f04343a59eaebdecff7ed4e 100644 (file)
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2128,7 +2128,9 @@ static void accel_activate(void)
                                }
 
 #if (ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO) && !defined(ZTS)
-                               accel_interned_strings_restore_state(TSRMLS_C);
+                               if (ZCG(accel_directives).interned_strings_buffer) {
+                                       accel_interned_strings_restore_state(TSRMLS_C);
+                               }
 #endif
 
                                zend_shared_alloc_restore_state();
@@ -2446,36 +2448,39 @@ static int zend_accel_init_shm(TSRMLS_D)
 
 #if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
 
+       ZCSG(interned_strings_start) = ZCSG(interned_strings_end) = NULL;
 # ifndef ZTS
        zend_hash_init(&ZCSG(interned_strings), (ZCG(accel_directives).interned_strings_buffer * 1024 * 1024) / (sizeof(Bucket) + sizeof(Bucket*) + 8 /* average string length */), NULL, NULL, 1);
-       ZCSG(interned_strings).nTableMask = ZCSG(interned_strings).nTableSize - 1;
-       ZCSG(interned_strings).arBuckets = zend_shared_alloc(ZCSG(interned_strings).nTableSize * sizeof(Bucket *));
-       ZCSG(interned_strings_start) = zend_shared_alloc((ZCG(accel_directives).interned_strings_buffer * 1024 * 1024));
-       if (!ZCSG(interned_strings).arBuckets || !ZCSG(interned_strings_start)) {
-               zend_accel_error(ACCEL_LOG_FATAL, ACCELERATOR_PRODUCT_NAME " cannot allocate buffer for interned strings");
-               return FAILURE;
+       if (ZCG(accel_directives).interned_strings_buffer) {
+               ZCSG(interned_strings).nTableMask = ZCSG(interned_strings).nTableSize - 1;
+               ZCSG(interned_strings).arBuckets = zend_shared_alloc(ZCSG(interned_strings).nTableSize * sizeof(Bucket *));
+               ZCSG(interned_strings_start) = zend_shared_alloc((ZCG(accel_directives).interned_strings_buffer * 1024 * 1024));
+               if (!ZCSG(interned_strings).arBuckets || !ZCSG(interned_strings_start)) {
+                       zend_accel_error(ACCEL_LOG_FATAL, ACCELERATOR_PRODUCT_NAME " cannot allocate buffer for interned strings");
+                       return FAILURE;
+               }
+               ZCSG(interned_strings_end)   = ZCSG(interned_strings_start) + (ZCG(accel_directives).interned_strings_buffer * 1024 * 1024);
+               ZCSG(interned_strings_top)   = ZCSG(interned_strings_start);
+
+               orig_interned_strings_start = CG(interned_strings_start);
+               orig_interned_strings_end = CG(interned_strings_end);
+               CG(interned_strings_start) = ZCSG(interned_strings_start);
+               CG(interned_strings_end) = ZCSG(interned_strings_end);
        }
-       ZCSG(interned_strings_end)   = ZCSG(interned_strings_start) + (ZCG(accel_directives).interned_strings_buffer * 1024 * 1024);
-       ZCSG(interned_strings_top)   = ZCSG(interned_strings_start);
-# else
-       ZCSG(interned_strings_start) = ZCSG(interned_strings_end) = NULL;
 # endif
 
-       orig_interned_strings_start = CG(interned_strings_start);
-       orig_interned_strings_end = CG(interned_strings_end);
        orig_new_interned_string = zend_new_interned_string;
        orig_interned_strings_snapshot = zend_interned_strings_snapshot;
        orig_interned_strings_restore = zend_interned_strings_restore;
-
-       CG(interned_strings_start) = ZCSG(interned_strings_start);
-       CG(interned_strings_end) = ZCSG(interned_strings_end);
        zend_new_interned_string = accel_new_interned_string_for_php;
        zend_interned_strings_snapshot = accel_interned_strings_snapshot_for_php;
        zend_interned_strings_restore = accel_interned_strings_restore_for_php;
 
 # ifndef ZTS
-       accel_use_shm_interned_strings(TSRMLS_C);
-       accel_interned_strings_save_state(TSRMLS_C);
+       if (ZCG(accel_directives).interned_strings_buffer) {
+               accel_use_shm_interned_strings(TSRMLS_C);
+               accel_interned_strings_save_state(TSRMLS_C);
+       }
 # endif
 
 #endif
@@ -2709,13 +2714,15 @@ void accel_shutdown(TSRMLS_D)
        }
 
 #if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
+       if (ZCG(accel_directives).interned_strings_buffer) {
 # ifndef ZTS
-       zend_hash_clean(CG(function_table));
-       zend_hash_clean(CG(class_table));
-       zend_hash_clean(EG(zend_constants));
+               zend_hash_clean(CG(function_table));
+               zend_hash_clean(CG(class_table));
+               zend_hash_clean(EG(zend_constants));
 # endif
-       CG(interned_strings_start) = orig_interned_strings_start;
-       CG(interned_strings_end) = orig_interned_strings_end;
+               CG(interned_strings_start) = orig_interned_strings_start;
+               CG(interned_strings_end) = orig_interned_strings_end;
+       }
        zend_new_interned_string = orig_new_interned_string;
        zend_interned_strings_snapshot = orig_interned_strings_snapshot;
        zend_interned_strings_restore = orig_interned_strings_restore;

diff --git a/ext/opcache/tests/bug66461.phpt b/ext/opcache/tests/bug66461.phpt
new file mode 100644 (file)
index 0000000..33132ab
--- /dev/null
+++ b/ext/opcache/tests/bug66461.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.optimization_level=-1
+opcache.file_update_protection=0
+opcache.interned_strings_buffer=0
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+echo "ok\n";
+--EXPECT--
+ok