diff options
| author | Dmitry Stogov <dmitry@php.net> | 2010-02-02 12:32:29 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2010-02-02 12:32:29 +0000 |
| commit | 694a72c5afbac78bc13b3cfde7c1cfd2c1fc9f68 (patch) | |
| tree | 670ff0baaf49ef02c60d5ed578ef69728fc6ad21 | |
| parent | 191b52d2723d82a8aa623af471f1dbfab6a5ce3f (diff) | |
| download | php-git-694a72c5afbac78bc13b3cfde7c1cfd2c1fc9f68.tar.gz | |
Fixed bug #50723 (Bug in garbage collector causes crash)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | Zend/zend_execute.h | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -39,6 +39,7 @@ PHP NEWS - Fixed bug #50732 (exec() adds single byte twice to $output array). (Ilia) - Fixed bug #50728 (All PDOExceptions hardcode 'code' property to 0). (Joey, Ilia) +- Fixed bug #50723 (Bug in garbage collector causes crash). (Dmitry) - Fixed bug #50690 (putenv does not set ENV when the value is only one char). (Pierre) - Fixed bug #50680 (strtotime() does not support eighth ordinal number). (Ilia) diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index dcbe93aa10..be493cac19 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -228,7 +228,7 @@ static inline void *zend_vm_stack_alloc(size_t size TSRMLS_DC) int extra = (ZEND_MM_ALIGNMENT - ((zend_uintptr_t)EG(argument_stack)->top & (ZEND_MM_ALIGNMENT - 1))) / sizeof(void*); if (UNEXPECTED(size + extra + ZEND_MM_ALIGNED_SIZE(sizeof(void*)) / sizeof(void*) > - (zend_uintptr_t)EG(argument_stack)->end - (zend_uintptr_t)EG(argument_stack)->top)) { + (zend_uintptr_t)(EG(argument_stack)->end - EG(argument_stack)->top))) { zend_vm_stack_extend(size TSRMLS_CC); } else { void **old_top = EG(argument_stack)->top; |