Patch bug55509.diff for Reproducible crash Bug #55509

Patch version 2011-09-06 15:11 UTC

Obsolete patches:

• bug55509.diff, revision 2011-09-06 13:42 UTC
• bug55509.diff, revision 2011-09-06 14:10 UTC

• 2011-09-06 15:11 UTC [diff to current]
• 2011-09-06 14:10 UTC [diff to current]
• 2011-09-06 13:42 UTC [diff to current]

Developer: laruence@php.net

Index: trunk/Zend/zend_alloc.c
===================================================================
--- trunk/Zend/zend_alloc.c	(revision 316256)
+++ trunk/Zend/zend_alloc.c	(working copy)
@@ -515,7 +515,7 @@
 #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))
 
Index: branches/PHP_5_3/Zend/zend_alloc.c
===================================================================
--- branches/PHP_5_3/Zend/zend_alloc.c	(revision 316244)
+++ branches/PHP_5_3/Zend/zend_alloc.c	(working copy)
@@ -510,7 +510,7 @@
 #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))
 
Index: branches/PHP_5_4/Zend/zend_alloc.c
===================================================================
--- branches/PHP_5_4/Zend/zend_alloc.c	(revision 316244)
+++ branches/PHP_5_4/Zend/zend_alloc.c	(working copy)
@@ -515,7 +515,7 @@
 #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))