archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/soap: prevent needless computation of strlen()

Browse source
This commit is contained in:
Gina Peter Banyard 2024-06-16 02:03:30 +01:00
parent 073491bfd8
commit 062353ce2d
No known key found for this signature in database
GPG key ID: 3306078E3194AEBD
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ext/soap/soap.c
View file

@ -55,7 +55,7 @@ static ZEND_NORETURN void soap_server_fault(char* code, char* string, char *acto
static void soap_server_fault_ex(sdlFunctionPtr function, zval* fault, soapHeader* hdr); static void soap_server_fault_ex(sdlFunctionPtr function, zval* fault, soapHeader* hdr);
static sdlParamPtr get_param(sdlFunctionPtr function, const char *param_name, zend_ulong index, int); static sdlParamPtr get_param(sdlFunctionPtr function, const char *param_name, zend_ulong index, int);
static sdlFunctionPtr get_function(sdlPtr sdl, const char *function_name); static sdlFunctionPtr get_function(sdlPtr sdl, const char *function_name, size_t function_name_length);
static sdlFunctionPtr get_doc_function(sdlPtr sdl, xmlNodePtr params); static sdlFunctionPtr get_doc_function(sdlPtr sdl, xmlNodePtr params);
static sdlFunctionPtr deserialize_function_call(sdlPtr sdl, xmlDocPtr request, const char* actor, zval *function_name, uint32_t *num_params, zval **parameters, int *version, soapHeader **headers); static sdlFunctionPtr deserialize_function_call(sdlPtr sdl, xmlDocPtr request, const char* actor, zval *function_name, uint32_t *num_params, zval **parameters, int *version, soapHeader **headers);
@ -2321,7 +2321,7 @@ static void do_soap_call(zend_execute_data *execute_data,
zend_try { zend_try {
if (sdl != NULL) { if (sdl != NULL) {
fn = get_function(sdl, ZSTR_VAL(function)); fn = get_function(sdl, ZSTR_VAL(function), ZSTR_LEN(function));
if (fn != NULL) { if (fn != NULL) {
sdlBindingPtr binding = fn->binding; sdlBindingPtr binding = fn->binding;
bool one_way = 0; bool one_way = 0;
@ -3024,7 +3024,8 @@ static sdlFunctionPtr find_function(sdlPtr sdl, xmlNodePtr func, zval* function_
{ {
sdlFunctionPtr function; sdlFunctionPtr function;
function = get_function(sdl, (char*)func->name); size_t xml_func_name_length = strlen((char*)func->name);
function = get_function(sdl, (char*)func->name, xml_func_name_length);
if (function && function->binding && function->binding->bindingType == BINDING_SOAP) { if (function && function->binding && function->binding->bindingType == BINDING_SOAP) {
sdlSoapBindingFunctionPtr fnb = (sdlSoapBindingFunctionPtr)function->bindingAttributes; sdlSoapBindingFunctionPtr fnb = (sdlSoapBindingFunctionPtr)function->bindingAttributes;
if (fnb->style == SOAP_DOCUMENT) { if (fnb->style == SOAP_DOCUMENT) {
@ -3042,7 +3043,7 @@ static sdlFunctionPtr find_function(sdlPtr sdl, xmlNodePtr func, zval* function_
if (function != NULL) { if (function != NULL) {
ZVAL_STRING(function_name, (char *)function->functionName); ZVAL_STRING(function_name, (char *)function->functionName);
} else { } else {
ZVAL_STRING(function_name, (char *)func->name); ZVAL_STRINGL(function_name, (char *)func->name, xml_func_name_length);
} }
return function; return function;
@ -4131,18 +4132,17 @@ static sdlParamPtr get_param(sdlFunctionPtr function, const char *param_name, ze
} }
/* }}} */ /* }}} */
static sdlFunctionPtr get_function(sdlPtr sdl, const char *function_name) /* {{{ */ static sdlFunctionPtr get_function(sdlPtr sdl, const char *function_name, size_t function_name_length) /* {{{ */
{ {
sdlFunctionPtr tmp; sdlFunctionPtr tmp;
size_t len = strlen(function_name); char *str = estrndup(function_name, function_name_length);
char *str = estrndup(function_name,len); zend_str_tolower(str, function_name_length);
zend_str_tolower(str,len);
if (sdl != NULL) { if (sdl != NULL) {
if ((tmp = zend_hash_str_find_ptr(&sdl->functions, str, len)) != NULL) { if ((tmp = zend_hash_str_find_ptr(&sdl->functions, str, function_name_length)) != NULL) {
efree(str); efree(str);
return tmp; return tmp;
} else if (sdl->requests != NULL && (tmp = zend_hash_str_find_ptr(sdl->requests, str, len)) != NULL) { } else if (sdl->requests != NULL && (tmp = zend_hash_str_find_ptr(sdl->requests, str, function_name_length)) != NULL) {
efree(str); efree(str);
return tmp; return tmp;
} }