Fix wrong macro usage and add missing NEWS entry

diff --git a/NEWS b/NEWS
index 9d87b9592f24246818b88a2b70ac0143c28a7c27..16932689538ed8d2a43619cd1f5280bac55d6b6f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,8 @@ PHP                                                                        NEWS
     details here: https://wiki.php.net/rfc/cli_process_title. (Keyur)
   . Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']).
     (Anatol)
+  . Added support for non-scalar Iterator keys in foreach
+    (https://wiki.php.net/rfc/foreach-non-scalar-keys). (Nikita Popov)
 
 - mysqlnd
   . Fixed bug #63530 (mysqlnd_stmt::bind_one_parameter crashes, uses wrong alloc

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 2653d0849afa5705a62c3ee9db8d015755e26887..8c3a357954360c13524c8e64c37601da50fad40d 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1521,7 +1521,7 @@ ZEND_API int array_set_zval_key(HashTable *ht, zval *key, zval *value) /* {{{ */
                        result = zend_hash_index_update(ht, Z_LVAL_P(key), &value, sizeof(zval *), NULL);
                        break;
                case IS_DOUBLE:
-                       result = zend_hash_index_update(ht, zend_dval_to_lval(Z_LVAL_P(key)), &value, sizeof(zval *), NULL);
+                       result = zend_hash_index_update(ht, zend_dval_to_lval(Z_DVAL_P(key)), &value, sizeof(zval *), NULL);
                        break;
                default:
                        zend_error(E_WARNING, "Illegal offset type");