]> granicus.if.org Git - php/commitdiff
Replaced usafe reference from SHM to process memory with SHM to SHM reference
authorDmitry Stogov <dmitry@zend.com>
Mon, 12 Mar 2018 08:18:12 +0000 (11:18 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 12 Mar 2018 08:18:12 +0000 (11:18 +0300)
ext/opcache/zend_file_cache.c

index 2c4fa18c4e8939a02afa8b265a996c7d11252b0c..213028b7a1d5d68502d67f1f6e0294b6c48e4d25 100644 (file)
@@ -893,7 +893,11 @@ static void zend_file_cache_unserialize_hash(HashTable               *ht,
 
        ht->pDestructor = dtor;
        if (!(ht->u.flags & HASH_FLAG_INITIALIZED)) {
-               HT_SET_DATA_ADDR(ht, &uninitialized_bucket);
+               if (EXPECTED(!file_cache_only)) {
+                       HT_SET_DATA_ADDR(ht, &ZCSG(uninitialized_bucket));
+               } else {
+                       HT_SET_DATA_ADDR(ht, &uninitialized_bucket);
+               }
                return;
        }
        if (IS_UNSERIALIZED(ht->arData)) {