Permalink
Browse files

Fixed bug #50723 (Bug in garbage collector causes crash)

  • Loading branch information...
1 parent 191b52d commit 694a72c5afbac78bc13b3cfde7c1cfd2c1fc9f68 Dmitry Stogov committed Feb 2, 2010
Showing with 2 additions and 1 deletion.
  1. +1 −0 NEWS
  2. +1 −1 Zend/zend_execute.h
View
1 NEWS
@@ -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)
View
@@ -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;

0 comments on commit 694a72c

Please sign in to comment.