com php-src: Use the same error msg with resize: Zend/zend_ha sh.c
| From: | Xinchen Hui | Date: | Wed, 12 Aug 2015 08:46:57 +0000 |
| Subject: | com php-src: Use the same error msg with resize: Zend/zend_ha sh.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88490@lists.php.net to get a copy of this message | ||
Commit: 0f68f12d9592ba5b2c75619378c77955e7eec413
Author: Xinchen Hui <laruence@php.net> Wed, 12 Aug 2015 16:46:57 +0800
Parents: d75228e201e382dbf328e5141a7c9ca279d09a45
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0f68f12d9592ba5b2c75619378c77955e7eec413
Log:
Use the same error msg with resize
Changed paths:
M Zend/zend_hash.c
Diff:
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index d010dff..2347f99 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -100,7 +100,7 @@ static uint32_t zend_always_inline zend_hash_check_size(uint32_t 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);
+ zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu +
%zu)", nSize, sizeof(Bucket), sizeof(Bucket));
}
#if defined(ZEND_WIN32)