From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 5 Mar 2018 20:38:15 +0000 (+0300)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~255
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d76061d5c128c3fd01db786198528f31fa1974ad;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed invalid destructor
---

d76061d5c128c3fd01db786198528f31fa1974ad
diff --cc ext/opcache/zend_accelerator_util_funcs.c
index eabc42a6be,95e9c504a0..f37e577f81
--- a/ext/opcache/zend_accelerator_util_funcs.c
+++ b/ext/opcache/zend_accelerator_util_funcs.c
@@@ -179,11 -180,11 +179,11 @@@ static void zend_hash_clone_constants(H
  	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_FLAGS(ht) = (HT_FLAGS(source) & HASH_FLAG_INITIALIZED);
  	ht->nInternalPointer = source->nNumOfElements ? 0 : HT_INVALID_IDX;
  
 -	if (!(ht->u.flags & HASH_FLAG_INITIALIZED)) {
 +	if (!(HT_FLAGS(ht) & HASH_FLAG_INITIALIZED)) {
  		ht->arData = source->arData;
  		return;
  	}