diff options
| author | Dmitry Stogov <dmitry@php.net> | 2008-02-19 16:39:02 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2008-02-19 16:39:02 +0000 |
| commit | 12e8e280c79a26a2beeebc4d753ff70633855003 (patch) | |
| tree | acd4f524ad87e631ef738a17cdd8a0c9a9bd7d39 /Zend | |
| parent | 59f4a9381f5405ebbf7c99076a5ac4ebcaf14b86 (diff) | |
| download | php-git-12e8e280c79a26a2beeebc4d753ff70633855003.tar.gz | |
Fixed memory leaks
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index df7f22a844..2ddb0cbedd 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1218,6 +1218,7 @@ ZEND_FUNCTION(set_error_handler) had_orig_error_handler = 1; *return_value = *EG(user_error_handler); zval_copy_ctor(return_value); + INIT_PZVAL(return_value); zend_stack_push(&EG(user_error_handlers_error_reporting), &EG(user_error_handler_error_reporting), sizeof(EG(user_error_handler_error_reporting))); zend_ptr_stack_push(&EG(user_error_handlers), EG(user_error_handler)); } @@ -1232,6 +1233,7 @@ ZEND_FUNCTION(set_error_handler) EG(user_error_handler_error_reporting) = (int)error_type; *EG(user_error_handler) = *error_handler; zval_copy_ctor(EG(user_error_handler)); + INIT_PZVAL(EG(user_error_handler)); if (!had_orig_error_handler) { RETURN_NULL(); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 6d7402f78b..607c0d3f13 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -181,6 +181,13 @@ static int zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS) ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr); INIT_ZVAL(*(EX_T(opline->result.u.var).var.ptr)); +if (strcmp(EX(function_state).function->common.function_name, "set_error_handler") == 0) { +static n = 0; +++n; +if (n>=542) { +fprintf(stderr, "%3d 0x%08X %s\n", n, EX_T(opline->result.u.var).var.ptr, EX(function_state).function->common.function_name); +} +} if (EX(function_state).function->common.arg_info) { zend_uint i=0; |