From d75228e201e382dbf328e5141a7c9ca279d09a45 Mon Sep 17 00:00:00 2001
From: Xinchen Hui <laruence@php.net>
Date: Wed, 12 Aug 2015 16:44:51 +0800
Subject: [PATCH] We should not silently go on if the required size can not be
 met

---
 Zend/zend_hash.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 96ed6794f7f..d010dff3603 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)) {