]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorAnatol Belski <ab@php.net>
Mon, 28 May 2018 15:15:22 +0000 (17:15 +0200)
committerAnatol Belski <ab@php.net>
Mon, 28 May 2018 15:15:22 +0000 (17:15 +0200)
* PHP-7.2:
  Translate correct C++ version with suitable compiler
  Fixed bug #76383 (array_map on $GLOBALS returns IS_INDIRECT)

1  2 
ext/standard/array.c
win32/build/confutils.js

index 55d338faad23093a531e01ab85977a812003a271,0a9cfb30cb01d322f84ce6832b3a5009ae398e0d..363abfc771f8a407ddf73db0426238d16812f2c5
@@@ -6138,9 -6079,8 +6138,9 @@@ PHP_FUNCTION(array_map
                }
  
                array_init_size(return_value, maxlen);
 +              zend_hash_real_init(Z_ARRVAL_P(return_value), HT_FLAGS(Z_ARRVAL(arrays[0])) & HASH_FLAG_PACKED);
  
-               ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL(arrays[0]), num_key, str_key, zv) {
+               ZEND_HASH_FOREACH_KEY_VAL_IND(Z_ARRVAL(arrays[0]), num_key, str_key, zv) {
                        fci.retval = &result;
                        fci.param_count = 1;
                        fci.params = &arg;
Simple merge