From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 11 Mar 2020 07:55:11 +0000 (+0100)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.7RC1~145
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a72b261db5cef0ad553e805d9ac656ddc040e681;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79364: When copy empty array, next key is unspecified
---

a72b261db5cef0ad553e805d9ac656ddc040e681
diff --cc NEWS
index 0836b20688,b290b23f81..a1f383fac5
--- a/NEWS
+++ b/NEWS
@@@ -1,12 -1,10 +1,15 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.3.17
 +
 +?? ??? ????, PHP 7.4.5
  
+ - Core:
+   . Fixed bug #79364 (When copy empty array, next key is unspecified). (cmb)
+ 
 +- SOAP:
 +  . Fixed bug #79357 (SOAP request segfaults when any request parameter is
 +    missing). (Nikita)
 +
  - Spl:
    . Fixed bug #75673 (SplStack::unserialize() behavior). (cmb)
  
diff --cc Zend/zend_hash.c
index c2c8cf825f,6fc4666da9..e342da889b
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@@ -2055,9 -1934,8 +2055,9 @@@ ZEND_API HashTable* ZEND_FASTCALL zend_
  		target->nTableMask = HT_MIN_MASK;
  		target->nNumUsed = 0;
  		target->nNumOfElements = 0;
- 		target->nNextFreeElement = 0;
+ 		target->nNextFreeElement = source->nNextFreeElement;
  		target->nInternalPointer = 0;
 +		target->nTableSize = HT_MIN_SIZE;
  		HT_SET_DATA_ADDR(target, &uninitialized_bucket);
  	} else if (GC_FLAGS(source) & IS_ARRAY_IMMUTABLE) {
  		HT_FLAGS(target) = HT_FLAGS(source) & HASH_FLAG_MASK;