diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-03-12 11:18:33 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-03-12 11:18:33 +0300 |
| commit | e6fb787c66cbffb4d1cbf6c284892789f0e16dec (patch) | |
| tree | 728218037f25d1bbfff4a82ab5ea05b4501adb9b | |
| parent | 2b02e6dff3750e58d8b3e6c5ede0ad3ccb68d353 (diff) | |
| parent | f31c4d5398b0741cbb9cc389a96d6ceff5aa5219 (diff) | |
| download | php-git-e6fb787c66cbffb4d1cbf6c284892789f0e16dec.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Replaced usafe reference from SHM to process memory with SHM to SHM reference
| -rw-r--r-- | ext/opcache/zend_file_cache.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/opcache/zend_file_cache.c b/ext/opcache/zend_file_cache.c index 908f88d67f..8789fb1dde 100644 --- a/ext/opcache/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c @@ -902,7 +902,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)) { |