diff options
| author | Anatol Belski <ab@php.net> | 2013-05-13 14:25:25 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-05-13 14:25:25 +0200 |
| commit | 156576fcced43efc558002d504732271f6cc1fe1 (patch) | |
| tree | f64e2d58ae5de84e0a398bce7f879572fe58d328 | |
| parent | 89159926ad1ceda2acb3c051599d3a918deba808 (diff) | |
| parent | fe21accfb4913bf309f26894ae27e9ad34fb5260 (diff) | |
| download | php-git-156576fcced43efc558002d504732271f6cc1fe1.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix heap overflow warnings on win x64 debug crt
| -rw-r--r-- | ext/soap/soap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 7df84e5b2a..e94c0e95ac 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -3909,7 +3909,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function if (version == SOAP_1_1) { if (zend_hash_find(prop, "faultcode", sizeof("faultcode"), (void**)&tmp) == SUCCESS) { - int new_len; + size_t new_len; xmlNodePtr node = xmlNewNode(NULL, BAD_CAST("faultcode")); char *str = php_escape_html_entities((unsigned char*)Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), &new_len, 0, 0, NULL TSRMLS_CC); xmlAddChild(param, node); @@ -3919,7 +3919,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function xmlNodeSetContent(node, code); xmlFree(code); } else { - xmlNodeSetContentLen(node, BAD_CAST(str), new_len); + xmlNodeSetContentLen(node, BAD_CAST(str), (int)new_len); } efree(str); } @@ -3934,7 +3934,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function detail_name = "detail"; } else { if (zend_hash_find(prop, "faultcode", sizeof("faultcode"), (void**)&tmp) == SUCCESS) { - int new_len; + size_t new_len; xmlNodePtr node = xmlNewChild(param, ns, BAD_CAST("Code"), NULL); char *str = php_escape_html_entities((unsigned char*)Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), &new_len, 0, 0, NULL TSRMLS_CC); node = xmlNewChild(node, ns, BAD_CAST("Value"), NULL); @@ -3944,7 +3944,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function xmlNodeSetContent(node, code); xmlFree(code); } else { - xmlNodeSetContentLen(node, BAD_CAST(str), new_len); + xmlNodeSetContentLen(node, BAD_CAST(str), (int)new_len); } efree(str); } |