com php-src: Another fix for uninitialized execute_data->sy mbol_table: Zend/zend_execute.c Zend/zend_execute .h

Commit: 73679bf6dbaf296153d7bf71829ab098e3eea844 Author: Dmitry Stogov <dmitry@zend.com> Tue, 8 Jul 2014 12:17:52 +0400 Parents: 7ba7dd1943bb4c1746f11b10461ac091cddc5aae Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=73679bf6dbaf296153d7bf71829ab098e3eea844 Log: Another fix for uninitialized execute_data->symbol_table Changed paths: M Zend/zend_execute.c M Zend/zend_execute.h Diff: diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index fc5e556..bc765b9 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1727,7 +1727,9 @@ ZEND_API zend_execute_data *zend_create_generator_execute_data(zend_execute_data } } - i_init_execute_data(execute_data, op_array, return_value, VM_FRAME_TOP_FUNCTION TSRMLS_CC); + EX(symbol_table) = NULL; + + i_init_func_execute_data(execute_data, op_array, return_value, VM_FRAME_TOP_FUNCTION TSRMLS_CC); return execute_data; } diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 4037345..717177a 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -228,7 +228,6 @@ static zend_always_inline zend_execute_data *zend_vm_stack_push_call_frame(zend_ call->called_scope = called_scope; call->object = object; call->prev_nested_call = prev; - call->symbol_table = NULL; return call; }