]> granicus.if.org Git - php/commitdiff
fix heap overflow warnings on win x64 debug crt
authorAnatol Belski <ab@php.net>
Mon, 13 May 2013 12:24:21 +0000 (14:24 +0200)
committerAnatol Belski <ab@php.net>
Mon, 13 May 2013 12:24:21 +0000 (14:24 +0200)
ext/soap/soap.c

index 6851a9b19c5683ce90d4cf825a88fffc4b62dff5..942e09bb95a82ae806e48c9325f534b22a0eb387 100644 (file)
@@ -4142,7 +4142,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);
@@ -4152,7 +4152,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);
                        }
@@ -4167,7 +4167,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);
@@ -4177,7 +4177,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);
                        }