diff options
| -rw-r--r-- | ext/soap/php_packet_soap.c | 2 | ||||
| -rw-r--r-- | ext/soap/php_schema.c | 1 | ||||
| -rw-r--r-- | ext/soap/soap.c | 14 |
3 files changed, 8 insertions, 9 deletions
diff --git a/ext/soap/php_packet_soap.c b/ext/soap/php_packet_soap.c index 4fa122e3bd..1f6adb625d 100644 --- a/ext/soap/php_packet_soap.c +++ b/ext/soap/php_packet_soap.c @@ -3,7 +3,7 @@ /* SOAP client calls this function to parse response from SOAP server */ int parse_packet_soap(zval *this_ptr, char *buffer, int buffer_size, sdlFunctionPtr fn, char *fn_name, zval *return_value TSRMLS_DC) { - char* envelope_ns; + char* envelope_ns = NULL; xmlDocPtr response; xmlNodePtr trav, env, head, body, resp, cur, fault; int param_count = 0; diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c index 03a3ba5d39..04b274bdbe 100644 --- a/ext/soap/php_schema.c +++ b/ext/soap/php_schema.c @@ -839,7 +839,6 @@ static int schema_element(sdlPtr sdl, xmlAttrPtr tsn, xmlNodePtr element, sdlTyp { xmlNodePtr content; xmlAttrPtr attrs, curattr, name, ns; - TSRMLS_FETCH(); /* is this really needed - or the parameter */ attrs = element->properties; ns = get_attribute(attrs, "targetNamespace"); diff --git a/ext/soap/soap.c b/ext/soap/soap.c index fddf4ebfe0..006332993d 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -969,7 +969,7 @@ PHP_METHOD(soapserver, handle) xmlDocPtr doc_request, doc_return; zval function_name, **params, **raw_post, *soap_obj, retval, **server_vars; char *fn_name, cont_len[30]; - int num_params = 0, size, i, call_status; + int num_params = 0, size, i, call_status = 0; xmlChar *buf; HashTable *function_table; @@ -1421,8 +1421,8 @@ static void do_soap_call(zval* thisObj, clear_soap_fault(thisObj TSRMLS_CC); -zend_try { old_soap_version = SOAP_GLOBAL(soap_version); +zend_try { SOAP_GLOBAL(soap_version) = soap_version; old_sdl = SOAP_GLOBAL(sdl); SOAP_GLOBAL(sdl) = sdl; @@ -1762,7 +1762,7 @@ static void set_soap_fault(zval *obj, char *fault_code, char *fault_string, char static void deseralize_function_call(sdlPtr sdl, xmlDocPtr request, zval *function_name, int *num_params, zval ***parameters, int *version TSRMLS_DC) { - char* envelope_ns; + char* envelope_ns = NULL; xmlNodePtr trav,env,head,body,func; int cur_param = 0,num_of_params = 0; zval tmp_function_name, **tmp_parameters = NULL; @@ -1926,8 +1926,8 @@ static void deseralize_function_call(sdlPtr sdl, xmlDocPtr request, zval *functi static xmlDocPtr seralize_response_call(sdlFunctionPtr function, char *function_name, char *uri, zval *ret, int version TSRMLS_DC) { xmlDoc *doc; - xmlNode *envelope,*body,*method = NULL, *param; - xmlNs *ns; + xmlNode *envelope = NULL, *body,*method = NULL, *param; + xmlNs *ns = NULL; sdlParamPtr parameter = NULL; smart_str *gen_ns = NULL; int param_count; @@ -2073,8 +2073,8 @@ static xmlDocPtr seralize_response_call(sdlFunctionPtr function, char *function_ static xmlDocPtr seralize_function_call(zval *this_ptr, sdlFunctionPtr function, char *function_name, char *uri, zval **arguments, int arg_count, int version TSRMLS_DC) { xmlDoc *doc; - xmlNode *envelope, *body, *method; - xmlNs *ns; + xmlNode *envelope = NULL, *body, *method = NULL; + xmlNs *ns = NULL; zval **zstyle, **zuse; int i, style, use; smart_str *gen_ns; |