diff options
| author | Andi Gutmans <andi@php.net> | 2004-12-17 22:24:51 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2004-12-17 22:24:51 +0000 |
| commit | 235e6c0afe1d7de47e914ae0183bbad1d3b56709 (patch) | |
| tree | d954bf5b7564e88a9661e5826d74ac77d63246bc | |
| parent | 13c2cbb515d3fbf4afe010f087c366450edb2371 (diff) | |
| download | php-git-235e6c0afe1d7de47e914ae0183bbad1d3b56709.tar.gz | |
- Fixed Bug #30562 Segmentation fault with __call()
| -rw-r--r-- | Zend/zend_object_handlers.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 8d777a1733..46d471c68e 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -478,12 +478,11 @@ static void zend_std_unset_dimension(zval *object, zval *offset TSRMLS_DC) ZEND_API void zend_std_call_user_call(INTERNAL_FUNCTION_PARAMETERS) { zend_internal_function *func = (zend_internal_function *)EG(function_state_ptr)->function; - zval method_name, method_args; zval *method_name_ptr, *method_args_ptr; zval *method_result_ptr = NULL; zend_class_entry *ce = Z_OBJCE_P(this_ptr); - method_args_ptr = &method_args; + ALLOC_ZVAL(method_args_ptr); INIT_PZVAL(method_args_ptr); array_init(method_args_ptr); @@ -493,7 +492,7 @@ ZEND_API void zend_std_call_user_call(INTERNAL_FUNCTION_PARAMETERS) RETURN_FALSE; } - method_name_ptr = &method_name; + ALLOC_ZVAL(method_name_ptr); INIT_PZVAL(method_name_ptr); ZVAL_STRING(method_name_ptr, func->function_name, 0); /* no dup - it's a copy */ @@ -511,8 +510,8 @@ ZEND_API void zend_std_call_user_call(INTERNAL_FUNCTION_PARAMETERS) } /* now destruct all auxiliaries */ - zval_dtor(method_args_ptr); - zval_dtor(method_name_ptr); + zval_ptr_dtor(&method_args_ptr); + zval_ptr_dtor(&method_name_ptr); /* destruct the function also, then - we have allocated it in get_method */ efree(func); |