From 38f942b88013b203129825329e84581d0ae330b3 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 9 Jan 2007 15:29:14 +0000 Subject: [PATCH] Fixed bug #40076 (zend_alloc.c: Value of enumeration constant must be in range of signed integer) --- NEWS | 4 +++- Zend/zend_alloc.c | 16 +++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NEWS b/NEWS index 453505dd9f..ac9ec8eff5 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Jan 2007, PHP 5.2.1RC3 - Improved proc_open(). Now on Windows it can run external commands not through - CMD.EXE. (Dmitry) + CMD.EXE. (Dmitry) +- Fixed bug #40076 (zend_alloc.c: Value of enumeration constant must be in + range of signed integer). (Dmitry) - Fixed bug #40036 (empty() does not work correctly with ArrayObject when using ARRAY_AS_PROPS). (Ilia) - Fixed bug #40002 (Try/Catch performs poorly). (Dmitry) diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index c547d47e4b..c097f3b1cd 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -292,13 +292,11 @@ static const zend_mm_mem_handlers mem_handlers[] = { /* Heap Manager */ /****************/ -typedef enum _mem_magic { - MEM_BLOCK_VALID = 0x7312F8DC, - MEM_BLOCK_FREED = 0x99954317, - MEM_BLOCK_CACHED = 0xFB8277DC, - MEM_BLOCK_GUARD = 0x2A8FCC84, - MEM_BLOCK_LEAK = 0x6C5E8F2D -} mem_magic; +#define MEM_BLOCK_VALID 0x7312F8DC +#define MEM_BLOCK_FREED 0x99954317 +#define MEM_BLOCK_CACHED 0xFB8277DC +#define MEM_BLOCK_GUARD 0x2A8FCC84 +#define MEM_BLOCK_LEAK 0x6C5E8F2D /* mm block type */ typedef struct _zend_mm_block_info { @@ -334,7 +332,7 @@ typedef struct _zend_mm_debug_info { typedef struct _zend_mm_block { zend_mm_block_info info; #if ZEND_DEBUG - mem_magic magic; + unsigned int magic; # ifdef ZTS THREAD_T thread_id; # endif @@ -347,7 +345,7 @@ typedef struct _zend_mm_block { typedef struct _zend_mm_free_block { zend_mm_block_info info; #if ZEND_DEBUG - mem_magic magic; + unsigned int magic; # ifdef ZTS THREAD_T thread_id; # endif -- 2.50.1