ext/soap: Refactor userland function calling code #19055
Conversation
ext/soap/soap.c
Outdated
| } else { | ||
| call_status = call_user_function(EG(function_table), NULL, &h->function_name, &h->retval, h->num_params, h->parameters); | ||
| } | ||
| call_status = call_user_function(NULL, soap_obj, &h->function_name, &h->retval, h->num_params, h->parameters); |
There was a problem hiding this comment.
Now you're passing soap_obj not only for service->type == SOAP_CLASS || service->type == SOAP_OBJECT but now also for zend_hash_find_ptr_lc(function_table, Z_STR(h->function_name)) != NULL. So this is changed behaviour, or what am I missing?
ext/soap/soap.c
Outdated
| zval_ptr_dtor(soap_obj); | ||
| soap_obj = NULL; | ||
| } | ||
| call_status = call_user_function(NULL, soap_obj, &function_name, &retval, num_params, params); |
| if (UNEXPECTED(header_fn == NULL)) { | ||
| if (soap_obj_ce && soap_obj_ce->__call) { | ||
| header_fn = zend_get_call_trampoline_func(soap_obj_ce, Z_STR(function_name), false); | ||
| goto soap_header_func_call; |
There was a problem hiding this comment.
Can you structure the code in such a way to avoid this goto?
| zend_function *header_fn = zend_hash_find_ptr_lc(function_table, Z_STR(h->function_name)); | ||
| if (UNEXPECTED(header_fn == NULL)) { | ||
| if (soap_obj_ce && soap_obj_ce->__call) { | ||
| header_fn = zend_get_call_trampoline_func(soap_obj_ce, Z_STR(function_name), false); |
There was a problem hiding this comment.
When using zend_get_call_trampoline_func you should also release the trampoline function when you're done with it. This usually doesn't cause problems because as long as you're outside of a trampoline call, this function will store the trampoline in EG(trampoline). It should be possible to test this by making a soap call from within a trampoline.
Commits should be reviewed in order.
This gets rid of some more
call_user_functionAPI calls and reduces the amount of string copying.