cvs: ZendEngine2(PHP_5_2) / zend_alloc.c

tony2001                Mon Feb 19 18:29:31 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /ZendEngine2        zend_alloc.c 
  Log:
  MFH: fix heap protection on SPARC, required by GCC4
  patch by Dmitry
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_alloc.c?r1=1.144.2.3.2.33&r2=1.144.2.3.2.34&diff_format=u
Index: ZendEngine2/zend_alloc.c
diff -u ZendEngine2/zend_alloc.c:1.144.2.3.2.33 
ZendEngine2/zend_alloc.c:1.144.2.3.2.34
--- ZendEngine2/zend_alloc.c:1.144.2.3.2.33     Fri Feb 16 23:49:48 2007
+++ ZendEngine2/zend_alloc.c    Mon Feb 19 18:29:31 2007
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_alloc.c,v 1.144.2.3.2.33 2007/02/16 23:49:48 tony2001 Exp $ */
+/* $Id: zend_alloc.c,v 1.144.2.3.2.34 2007/02/19 18:29:31 tony2001 Exp $ */
 
 #include "zend.h"
 #include "zend_alloc.h"
@@ -530,12 +530,12 @@
        } while (0)
 
 # define ZEND_MM_END_MAGIC_PTR(block) \
-       (unsigned int*)(((char*)(ZEND_MM_DATA_OF(block))) + 
((zend_mm_block*)(block))->debug.size)
+       (((char*)(ZEND_MM_DATA_OF(block))) + 
((zend_mm_block*)(block))->debug.size)
 
 # define END_MAGIC_SIZE sizeof(unsigned int)
 
 # define ZEND_MM_SET_BLOCK_SIZE(block, __size) do { \
-               unsigned int *p; \
+               char *p; \
                ((zend_mm_block*)(block))->debug.size = (__size); \
                p = ZEND_MM_END_MAGIC_PTR(block); \
                ((zend_mm_block*)(block))->debug.start_magic = 
_mem_block_start_magic; \
@@ -1112,7 +1112,7 @@
                        zend_debug_alloc_output("Unknown\n");
                }
        } else {
-               unsigned int *end_magic = ZEND_MM_END_MAGIC_PTR(p);
+               char *end_magic = ZEND_MM_END_MAGIC_PTR(p);
 
                if (p->debug.start_magic == _mem_block_start_magic) {
                        if (!silent) {

-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php