diff options
Diffstat (limited to 'sapi/phpdbg/phpdbg_list.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_list.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/sapi/phpdbg/phpdbg_list.c b/sapi/phpdbg/phpdbg_list.c index b0bb157f08..5755884ef6 100644 --- a/sapi/phpdbg/phpdbg_list.c +++ b/sapi/phpdbg/phpdbg_list.c @@ -198,11 +198,12 @@ void phpdbg_list_function_byname(const char *str, size_t len) /* {{{ */ /* search active scope if begins with period */ if (func_name[0] == '.') { - if (EG(scope)) { + zend_class_entry *scope = zend_get_executed_scope(); + if (scope) { func_name++; func_name_len--; - func_table = &EG(scope)->function_table; + func_table = &scope->function_table; } else { phpdbg_error("inactive", "type=\"noclasses\"", "No active class"); return; @@ -381,23 +382,9 @@ zend_op_array *phpdbg_compile_string(zval *source_string, char *filename) { return op_array; } -void phpdbg_free_file_source(zval *zv) { - phpdbg_file_source *data = Z_PTR_P(zv); - - if (data->buf) { - efree(data->buf); - } - efree(data->filename); - - destroy_op_array(&data->op_array); - - efree(data); -} - void phpdbg_init_list(void) { PHPDBG_G(compile_file) = zend_compile_file; PHPDBG_G(compile_string) = zend_compile_string; - zend_hash_init(&PHPDBG_G(file_sources), 1, NULL, (dtor_func_t) phpdbg_free_file_source, 0); zend_compile_file = phpdbg_compile_file; zend_compile_string = phpdbg_compile_string; } |