- Should fix the memory leak when returning from the main scope.

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index f8f4e6e1a78f31f5e3241484203cfb55aaa179b0..262b21ab7a3d47b966e4bf389fd0c09bf018a120 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -100,6 +100,7 @@ void init_executor(CLS_D ELS_DC)
 #endif
 #endif
        EG(return_value) = &EG(global_return_value);
+       var_reset(EG(return_value));
        EG(symtable_cache_ptr) = EG(symtable_cache)-1;
        EG(symtable_cache_limit)=EG(symtable_cache)+SYMTABLE_CACHE_SIZE-1;
        EG(no_extensions)=0;
@@ -120,6 +121,7 @@ void init_executor(CLS_D ELS_DC)
 
 void shutdown_executor(ELS_D)
 {
+       zval_dtor(EG(return_value));
        zend_ptr_stack_destroy(&EG(arg_types_stack));
        zend_stack_destroy(&EG(overloaded_objects_stack));