summaryrefslogtreecommitdiff
path: root/Zend/zend_alloc.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2011-09-13 07:01:46 +0000
committerDmitry Stogov <dmitry@php.net>2011-09-13 07:01:46 +0000
commit19dd70518cd89e5e777dedd13cfec98bd75262a6 (patch)
treea8eaf2592147524994c1ad71888793484ced4ac8 /Zend/zend_alloc.c
parentc8be5036beb101b34610a7ef03689082e71a8fcd (diff)
downloadphp-git-19dd70518cd89e5e777dedd13cfec98bd75262a6.tar.gz
Fixed bug #55509 (segfault on x86_64 using more than 2G memory). (Laruence)
Diffstat (limited to 'Zend/zend_alloc.c')
-rw-r--r--Zend/zend_alloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index e7e7ee9d22..bd2f2bb73d 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -515,7 +515,7 @@ static unsigned int _zend_mm_cookie = 0;
#define ZEND_MM_IS_GUARD_BLOCK(b) (((b)->info._size & ZEND_MM_TYPE_MASK) == ZEND_MM_GUARD_BLOCK)
#define ZEND_MM_NEXT_BLOCK(b) ZEND_MM_BLOCK_AT(b, ZEND_MM_BLOCK_SIZE(b))
-#define ZEND_MM_PREV_BLOCK(b) ZEND_MM_BLOCK_AT(b, -(int)((b)->info._prev & ~ZEND_MM_TYPE_MASK))
+#define ZEND_MM_PREV_BLOCK(b) ZEND_MM_BLOCK_AT(b, -(ssize_t)((b)->info._prev & ~ZEND_MM_TYPE_MASK))
#define ZEND_MM_PREV_BLOCK_IS_FREE(b) (!((b)->info._prev & ZEND_MM_USED_BLOCK))