diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-03-05 23:33:53 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-03-05 23:33:53 +0300 |
| commit | 53baf6fa1d510e54980605d07398a1e1ad445cfc (patch) | |
| tree | bd7979b51f9ee891e78379b446214614e93555fe | |
| parent | 634a1ff03307ada15e3585b7c36e1395687bb4a4 (diff) | |
| parent | 87553b073076d3b01ba05908336e8413e5a6a4c2 (diff) | |
| download | php-git-53baf6fa1d510e54980605d07398a1e1ad445cfc.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed invalid destructor
| -rw-r--r-- | ext/opcache/zend_accelerator_util_funcs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c index 3c35c9c493..95e9c504a0 100644 --- a/ext/opcache/zend_accelerator_util_funcs.c +++ b/ext/opcache/zend_accelerator_util_funcs.c @@ -180,7 +180,7 @@ static void zend_hash_clone_constants(HashTable *ht, HashTable *source) ht->nNumUsed = 0; ht->nNumOfElements = source->nNumOfElements; ht->nNextFreeElement = source->nNextFreeElement; - ht->pDestructor = ZVAL_PTR_DTOR; + ht->pDestructor = NULL; ht->u.flags = (source->u.flags & HASH_FLAG_INITIALIZED) | HASH_FLAG_APPLY_PROTECTION; ht->nInternalPointer = source->nNumOfElements ? 0 : HT_INVALID_IDX; |