Skip to content

Commit c60d0bf

Browse files
committed
Address CR comments
Signed-off-by: Bob Weinand <bobwei9@hotmail.com>
1 parent b75ae27 commit c60d0bf

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Zend/zend_hash.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2391,7 +2391,7 @@ static zend_always_inline uint32_t zend_array_dup_elements(HashTable *source, Ha
23912391
uint32_t target_idx = idx;
23922392

23932393
idx++; p++;
2394-
if (EXPECTED(!HT_HAS_ITERATORS(target))) {
2394+
if (!with_holes || EXPECTED(!HT_HAS_ITERATORS(target))) {
23952395
while (p != end) {
23962396
if (zend_array_dup_element(source, target, target_idx, p, q, 0, static_keys, with_holes)) {
23972397
if (source->nInternalPointer == idx) {

Zend/zend_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ typedef uint32_t HashPosition;
533533
typedef struct _HashTableIterator {
534534
HashTable *ht;
535535
HashPosition pos;
536-
uint32_t next_copy;
536+
uint32_t next_copy; // circular linked list via index into EG(ht_iterators)
537537
} HashTableIterator;
538538

539539
struct _zend_object {

0 commit comments

Comments
 (0)