mirror of
https://github.com/php/php-src.git
synced 2024-10-02 23:36:16 +00:00
Merge branch 'PHP-5.5'
* PHP-5.5: fix heap overflow warnings on win x64 debug crt
This commit is contained in:
commit
65fda25024
@ -3920,7 +3920,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
|
|||||||
|
|
||||||
if (version == SOAP_1_1) {
|
if (version == SOAP_1_1) {
|
||||||
if (zend_hash_find(prop, "faultcode", sizeof("faultcode"), (void**)&tmp) == SUCCESS) {
|
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"));
|
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);
|
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);
|
xmlAddChild(param, node);
|
||||||
@ -3930,7 +3930,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
|
|||||||
xmlNodeSetContent(node, code);
|
xmlNodeSetContent(node, code);
|
||||||
xmlFree(code);
|
xmlFree(code);
|
||||||
} else {
|
} else {
|
||||||
xmlNodeSetContentLen(node, BAD_CAST(str), new_len);
|
xmlNodeSetContentLen(node, BAD_CAST(str), (int)new_len);
|
||||||
}
|
}
|
||||||
efree(str);
|
efree(str);
|
||||||
}
|
}
|
||||||
@ -3945,7 +3945,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
|
|||||||
detail_name = "detail";
|
detail_name = "detail";
|
||||||
} else {
|
} else {
|
||||||
if (zend_hash_find(prop, "faultcode", sizeof("faultcode"), (void**)&tmp) == SUCCESS) {
|
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);
|
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);
|
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);
|
node = xmlNewChild(node, ns, BAD_CAST("Value"), NULL);
|
||||||
@ -3955,7 +3955,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
|
|||||||
xmlNodeSetContent(node, code);
|
xmlNodeSetContent(node, code);
|
||||||
xmlFree(code);
|
xmlFree(code);
|
||||||
} else {
|
} else {
|
||||||
xmlNodeSetContentLen(node, BAD_CAST(str), new_len);
|
xmlNodeSetContentLen(node, BAD_CAST(str), (int)new_len);
|
||||||
}
|
}
|
||||||
efree(str);
|
efree(str);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user