diff options
| author | Nikita Popov <nikic@php.net> | 2015-08-26 22:07:48 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-08-28 18:59:46 +0200 |
| commit | 7f2261d24a1304d144ad2ba60ad3fd70be923f35 (patch) | |
| tree | d640856ccfc6dc8c824fa1765d7ba638b8836420 | |
| parent | 127db5a37d178caac24f4eabbc6695923864e60a (diff) | |
| download | php-git-7f2261d24a1304d144ad2ba60ad3fd70be923f35.tar.gz | |
Fix HT_ASSERT ht->nInternalPointer checks
The & was on the wrong side...
| -rw-r--r-- | Zend/zend_hash.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index 139b0986f1..e0d40922af 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -1967,7 +1967,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_internal_pointer_reset_ex(HashTable *ht, H uint32_t idx; IS_CONSISTENT(ht); - HT_ASSERT(ht->nInternalPointer != &pos || GC_REFCOUNT(ht) == 1); + HT_ASSERT(&ht->nInternalPointer != pos || GC_REFCOUNT(ht) == 1); for (idx = 0; idx < ht->nNumUsed; idx++) { if (Z_TYPE(ht->arData[idx].val) != IS_UNDEF) { @@ -1987,7 +1987,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_internal_pointer_end_ex(HashTable *ht, Has uint32_t idx; IS_CONSISTENT(ht); - HT_ASSERT(ht->nInternalPointer != &pos || GC_REFCOUNT(ht) == 1); + HT_ASSERT(&ht->nInternalPointer != pos || GC_REFCOUNT(ht) == 1); idx = ht->nNumUsed; while (idx > 0) { @@ -2006,7 +2006,7 @@ ZEND_API int ZEND_FASTCALL zend_hash_move_forward_ex(HashTable *ht, HashPosition uint32_t idx = *pos; IS_CONSISTENT(ht); - HT_ASSERT(ht->nInternalPointer != &pos || GC_REFCOUNT(ht) == 1); + HT_ASSERT(&ht->nInternalPointer != pos || GC_REFCOUNT(ht) == 1); if (idx != HT_INVALID_IDX) { while (1) { @@ -2030,7 +2030,7 @@ ZEND_API int ZEND_FASTCALL zend_hash_move_backwards_ex(HashTable *ht, HashPositi uint32_t idx = *pos; IS_CONSISTENT(ht); - HT_ASSERT(ht->nInternalPointer != &pos || GC_REFCOUNT(ht) == 1); + HT_ASSERT(&ht->nInternalPointer != pos || GC_REFCOUNT(ht) == 1); if (idx != HT_INVALID_IDX) { while (idx > 0) { |