com php-src: fix index insert: Zend/zend_hash.c
| From: | Anatol Belski | Date: | Sat, 09 Nov 2013 09:56:51 +0000 |
| Subject: | com php-src: fix index insert: Zend/zend_hash.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73910@lists.php.net to get a copy of this message | ||
Commit: 7c5af3884ae51d9d5d15c40054cff7b290ae8f0d
Author: Anatol Belski <ab@php.net> Sat, 9 Nov 2013 10:56:51 +0100
Parents: c58f9eea11da6ef166275b0dac60cf11e406aeb8
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7c5af3884ae51d9d5d15c40054cff7b290ae8f0d
Log:
fix index insert
Changed paths:
M Zend/zend_hash.c
Diff:
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index b7f7ffd..816a13f 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -383,8 +383,8 @@ ZEND_API int _zend_hash_index_update_or_next_insert(HashTable *ht, zend_uint_t h
}
UPDATE_DATA(ht, p, pData, nDataSize);
HANDLE_UNBLOCK_INTERRUPTIONS();
- if ((long)h >= (long)ht->nNextFreeElement) {
- ht->nNextFreeElement = h < LONG_MAX ? h + 1 : LONG_MAX;
+ if ((zend_int_t)h >= (zend_int_t)ht->nNextFreeElement) {
+ ht->nNextFreeElement = h < ZEND_INT_MAX ? h + 1 : ZEND_INT_MAX;
}
if (pDest) {
*pDest = p->pData;
@@ -409,8 +409,8 @@ ZEND_API int _zend_hash_index_update_or_next_insert(HashTable *ht, zend_uint_t h
CONNECT_TO_GLOBAL_DLLIST(p, ht);
HANDLE_UNBLOCK_INTERRUPTIONS();
- if ((long)h >= (long)ht->nNextFreeElement) {
- ht->nNextFreeElement = h < LONG_MAX ? h + 1 : LONG_MAX;
+ if ((zend_int_t)h >= (zend_int_t)ht->nNextFreeElement) {
+ ht->nNextFreeElement = h < ZEND_INT_MAX ? h + 1 : ZEND_INT_MAX;
}
ht->nNumOfElements++;
ZEND_HASH_IF_FULL_DO_RESIZE(ht);