1
0
mirror of https://github.com/php/php-src.git synced 2026-04-26 17:38:14 +02:00

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
This commit is contained in:
Dmitry Stogov
2018-03-12 11:18:33 +03:00
+5 -1
View File
@@ -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)) {