com php-src: fix bit shift 64 vs 32 bit vars: Zend/zend_hash .c
| From: | Anatol Belski | Date: | Fri, 27 Dec 2013 23:38:49 +0000 |
| Subject: | com php-src: fix bit shift 64 vs 32 bit vars: Zend/zend_hash .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75483@lists.php.net to get a copy of this message | ||
Commit: b8b4591265159b88f2137674d2445a7288d4c79e
Author: Anatol Belski <ab@php.net> Sat, 28 Dec 2013 00:38:49 +0100
Parents: e2df932ef09e221fb7353176a4f8ae3387fafbd5
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b8b4591265159b88f2137674d2445a7288d4c79e
Log:
fix bit shift 64 vs 32 bit vars
Changed paths:
M Zend/zend_hash.c
Diff:
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 5d223d0..779fcf6 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -147,14 +147,14 @@ ZEND_API int _zend_hash_init(HashTable *ht, zend_uint_t nSize, dtor_func_t
pDest
SET_INCONSISTENT(HT_OK);
- if (nSize >= 0x80000000) {
+ if (nSize >= ZEND_INT_MAX) {
/* prevent overflow */
- ht->nTableSize = 0x80000000;
+ ht->nTableSize = ZEND_INT_MAX;
} else {
while ((Z_UI(1) << i) < nSize) {
i++;
}
- ht->nTableSize = 1 << i;
+ ht->nTableSize = Z_UI(1) << i;
}
ht->nTableMask = 0; /* 0 means that ht->arBuckets is uninitialized */