diff options
| -rw-r--r-- | Zend/zend_hash.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index 96ed6794f7..d010dff360 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -97,7 +97,11 @@ static uint32_t zend_always_inline zend_hash_check_size(uint32_t nSize) /* Use big enough power of 2 */ /* size should be between HT_MIN_SIZE and HT_MAX_SIZE */ - nSize = (nSize <= HT_MIN_SIZE ? HT_MIN_SIZE : (nSize >= HT_MAX_SIZE ? HT_MAX_SIZE : nSize)); + if (nSize < HT_MIN_SIZE) { + nSize = HT_MIN_SIZE; + } else if (UNEXPECTED(nSize >= HT_MAX_SIZE)) { + zend_error_noreturn(E_ERROR, "Array size is too big", nSize); + } #if defined(ZEND_WIN32) if (BitScanReverse(&index, nSize - 1)) { |