dmitry Tue, 02 Feb 2010 12:32:29 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=294334
Log: Fixed bug #50723 (Bug in garbage collector causes crash) Bug: http://bugs.php.net/50723 (Assigned) Bug in garbage collector causes crash Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/Zend/zend_execute.h U php/php-src/trunk/Zend/zend_execute.h Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-02-02 04:49:02 UTC (rev 294333) +++ php/php-src/branches/PHP_5_3/NEWS 2010-02-02 12:32:29 UTC (rev 294334) @@ -39,6 +39,7 @@ - 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) Modified: php/php-src/branches/PHP_5_3/Zend/zend_execute.h =================================================================== --- php/php-src/branches/PHP_5_3/Zend/zend_execute.h 2010-02-02 04:49:02 UTC (rev 294333) +++ php/php-src/branches/PHP_5_3/Zend/zend_execute.h 2010-02-02 12:32:29 UTC (rev 294334) @@ -228,7 +228,7 @@ 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; Modified: php/php-src/trunk/Zend/zend_execute.h =================================================================== --- php/php-src/trunk/Zend/zend_execute.h 2010-02-02 04:49:02 UTC (rev 294333) +++ php/php-src/trunk/Zend/zend_execute.h 2010-02-02 12:32:29 UTC (rev 294334) @@ -246,7 +246,7 @@ 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;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
