From 2cca3d0dd20eb58adbbee020095f989e164d63e5 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 24 Jul 2008 13:46:28 +0000 Subject: Optimized ZEND_SIGNED_MULTIPLY_LONG() (Matt) --- Zend/zend_alloc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'Zend/zend_alloc.c') diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 856abc6711..67b415e056 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2355,6 +2355,19 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) return res; } +#elif SIZEOF_SIZE_T == 4 && defined(HAVE_ZEND_LONG64) + +static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) +{ + zend_ulong64 res = (zend_ulong64)nmemb * (zend_ulong64)size + (zend_ulong64)offset; + + if (UNEXPECTED(res > (zend_ulong64)0xFFFFFFFFL)) { + zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset); + return 0; + } + return (size_t) res; +} + #else static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) -- cgit v1.2.1