diff options
| author | Antony Dovgal <tony2001@php.net> | 2007-02-19 18:29:31 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2007-02-19 18:29:31 +0000 |
| commit | 13ca6ed9fa4a410839026585d252d3e0a9bd05b1 (patch) | |
| tree | b0b065460408c6e77ce38300a74b50f5d9793d8b /Zend/zend_alloc.c | |
| parent | 8f5907fe96e711eac6c1147457ee25f6440962b3 (diff) | |
| download | php-git-13ca6ed9fa4a410839026585d252d3e0a9bd05b1.tar.gz | |
MFH: fix heap protection on SPARC, required by GCC4
patch by Dmitry
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 76a2a8aa6a..6651ee8369 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -530,12 +530,12 @@ static unsigned int _zend_mm_cookie = 0; } 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 @@ static int zend_mm_check_ptr(zend_mm_heap *heap, void *ptr, int silent ZEND_FILE 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) { |