com php-src: array_dup should not copy the nApplyCo unt: Zend/zend_hash.c
| From: | Xinchen Hui | Date: | Mon, 21 Mar 2016 11:19:05 +0000 |
| Subject: | com php-src: array_dup should not copy the nApplyCo unt: Zend/zend_hash.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91445@lists.php.net to get a copy of this message | ||
Commit: d26ca894020bc28eb55b153fac5548374d5ce16d
Author: Xinchen Hui <laruence@gmail.com> Mon, 21 Mar 2016 19:19:05 +0800
Parents: 9712a974beb53f47bcffb2c6554cc5c85d231fe2
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d26ca894020bc28eb55b153fac5548374d5ce16d
Log:
array_dup should not copy the nApplyCount
Changed paths:
M Zend/zend_hash.c
Diff:
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 39e9e14..5404187 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -1794,7 +1794,7 @@ ZEND_API HashTable* ZEND_FASTCALL zend_array_dup(HashTable *source)
target->pDestructor = source->pDestructor;
if (source->nNumUsed == 0) {
- target->u.flags = (source->u.flags &
~(HASH_FLAG_INITIALIZED|HASH_FLAG_PACKED|HASH_FLAG_PERSISTENT)) | HASH_FLAG_APPLY_PROTECTION |
HASH_FLAG_STATIC_KEYS;
+ target->u.flags = (source->u.flags &
~(HASH_FLAG_INITIALIZED|HASH_FLAG_PACKED|HASH_FLAG_PERSISTENT|ZEND_HASH_APPLY_COUNT_MASK)) |
HASH_FLAG_APPLY_PROTECTION | HASH_FLAG_STATIC_KEYS;
target->nTableMask = HT_MIN_MASK;
target->nNumUsed = 0;
target->nNumOfElements = 0;
@@ -1819,7 +1819,7 @@ ZEND_API HashTable* ZEND_FASTCALL zend_array_dup(HashTable *source)
target->nInternalPointer = idx;
}
} else if (source->u.flags & HASH_FLAG_PACKED) {
- target->u.flags = (source->u.flags & ~HASH_FLAG_PERSISTENT) |
HASH_FLAG_APPLY_PROTECTION;
+ target->u.flags = (source->u.flags &
~(HASH_FLAG_PERSISTENT|ZEND_HASH_APPLY_COUNT_MASK)) | HASH_FLAG_APPLY_PROTECTION;
target->nTableMask = source->nTableMask;
target->nNumUsed = source->nNumUsed;
target->nNumOfElements = source->nNumOfElements;
@@ -1842,7 +1842,7 @@ ZEND_API HashTable* ZEND_FASTCALL zend_array_dup(HashTable *source)
target->nInternalPointer = idx;
}
} else {
- target->u.flags = (source->u.flags & ~HASH_FLAG_PERSISTENT) |
HASH_FLAG_APPLY_PROTECTION;
+ target->u.flags = (source->u.flags &
~(HASH_FLAG_PERSISTENT|ZEND_HASH_APPLY_COUNT_MASK)) | HASH_FLAG_APPLY_PROTECTION;
target->nTableMask = source->nTableMask;
target->nNextFreeElement = source->nNextFreeElement;
target->nInternalPointer = HT_INVALID_IDX;