diff options
| author | Dmitry Stogov <dmitry@php.net> | 2011-09-13 07:01:46 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2011-09-13 07:01:46 +0000 |
| commit | b6173bee922363affe761bfaa1f7e7c678e8dd96 (patch) | |
| tree | c4e627645ac0d6afc67161897f4c39de8001c31d /Zend/zend_alloc.c | |
| parent | 4262382199df2731511840b06ec20887134a82cf (diff) | |
| download | php-git-b6173bee922363affe761bfaa1f7e7c678e8dd96.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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 2d8d26a99f..3c3b579e7b 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)) |