]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorDmitry Stogov <dmitry@zend.com>
Mon, 5 Mar 2018 20:38:15 +0000 (23:38 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 5 Mar 2018 20:38:15 +0000 (23:38 +0300)
* PHP-7.2:
  Fixed invalid destructor

1  2 
ext/opcache/zend_accelerator_util_funcs.c

index eabc42a6beb1e8e96c22ca69f2d83e5c97470ce9,95e9c504a0b99e5a6b10029b143bcbc9b95c5fd4..f37e577f81d77d6b923387ef62a23982cc0b6e84
@@@ -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;
        }