com php-src: Fix HT_ASSERT ht->nInternalPointer checks : Zend/zend_hash.c

From: Date: Fri, 28 Aug 2015 16:59:46 +0000
Subject: com php-src: Fix HT_ASSERT ht->nInternalPointer checks : Zend/zend_hash.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-88797@lists.php.net to get a copy of this message
Commit: 7f2261d24a1304d144ad2ba60ad3fd70be923f35 Author: Nikita Popov <nikic@php.net> Wed, 26 Aug 2015 22:07:48 +0200 Parents: 127db5a37d178caac24f4eabbc6695923864e60a Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7f2261d24a1304d144ad2ba60ad3fd70be923f35 Log: Fix HT_ASSERT ht->nInternalPointer checks The & was on the wrong side... Changed paths: M Zend/zend_hash.c Diff: diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index 139b098..e0d4092 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) {

« previous php.cvs (#88797) next »