We should not silently go on if the required size can not be met

This commit is contained in:
Xinchen Hui 2015-08-12 16:44:51 +08:00
parent 60b75eb9ed
commit d75228e201

View File

@ -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)) {