tony2001 Thu Jan 18 16:21:32 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/soap soap.c
/php-src/ext/standard html.c
/php-src/ext/wddx wddx.c
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.17&r2=1.156.2.28.2.18&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.17
php-src/ext/soap/soap.c:1.156.2.28.2.18
--- php-src/ext/soap/soap.c:1.156.2.28.2.17 Mon Jan 1 09:36:07 2007
+++ php-src/ext/soap/soap.c Thu Jan 18 16:21:32 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.156.2.28.2.17 2007/01/01 09:36:07 sebastian Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.18 2007/01/18 16:21:32 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1853,7 +1853,7 @@
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Dump memory
failed");
}
- sprintf(cont_len, "Content-Length: %d", size);
+ snprintf(cont_len, sizeof(cont_len), "Content-Length: %d",
size);
sapi_add_header(cont_len, strlen(cont_len), 1);
if (soap_version == SOAP_1_2) {
sapi_add_header("Content-Type: application/soap+xml;
charset=utf-8", sizeof("Content-Type: application/soap+xml; charset=utf-8")-1,
1);
@@ -1982,7 +1982,7 @@
our fault code with their own handling... Figure this out later
*/
sapi_add_header("HTTP/1.1 500 Internal Service Error", sizeof("HTTP/1.1
500 Internal Service Error")-1, 1);
- sprintf(cont_len,"Content-Length: %d", size);
+ snprintf(cont_len, sizeof(cont_len), "Content-Length: %d", size);
sapi_add_header(cont_len, strlen(cont_len), 1);
if (soap_version == SOAP_1_2) {
sapi_add_header("Content-Type: application/soap+xml;
charset=utf-8", sizeof("Content-Type: application/soap+xml; charset=utf-8")-1,
1);
@@ -4223,7 +4223,7 @@
} else {
if (name == NULL) {
paramName = paramNameBuf;
- sprintf(paramName,"param%d",index);
+ snprintf(paramName, sizeof(paramNameBuf),
"param%d",index);
} else {
paramName = name;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.111.2.2.2.5&r2=1.111.2.2.2.6&diff_format=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.111.2.2.2.5
php-src/ext/standard/html.c:1.111.2.2.2.6
--- php-src/ext/standard/html.c:1.111.2.2.2.5 Mon Jan 1 09:36:08 2007
+++ php-src/ext/standard/html.c Thu Jan 18 16:21:32 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: html.c,v 1.111.2.2.2.5 2007/01/01 09:36:08 sebastian Exp $ */
+/* $Id: html.c,v 1.111.2.2.2.6 2007/01/18 16:21:32 tony2001 Exp $ */
/*
* HTML entity resources:
@@ -1354,7 +1354,7 @@
continue;
/* what about wide chars here ?? */
ind[0] = i + entity_map[j].basechar;
- sprintf(buffer, "&%s;",
entity_map[j].table[i]);
+ snprintf(buffer, sizeof(buffer),
"&%s;", entity_map[j].table[i]);
add_assoc_string(return_value, ind,
buffer, 1);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/wddx.c?r1=1.119.2.10.2.9&r2=1.119.2.10.2.10&diff_format=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.119.2.10.2.9
php-src/ext/wddx/wddx.c:1.119.2.10.2.10
--- php-src/ext/wddx/wddx.c:1.119.2.10.2.9 Tue Jan 9 15:20:45 2007
+++ php-src/ext/wddx/wddx.c Thu Jan 18 16:21:32 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: wddx.c,v 1.119.2.10.2.9 2007/01/09 15:20:45 iliaa Exp $ */
+/* $Id: wddx.c,v 1.119.2.10.2.10 2007/01/18 16:21:32 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -448,7 +448,7 @@
PHP_SET_CLASS_ATTRIBUTES(obj);
php_wddx_add_chunk_static(packet, WDDX_STRUCT_S);
- sprintf(tmp_buf, WDDX_VAR_S, PHP_CLASS_NAME_VAR);
+ snprintf(tmp_buf, WDDX_BUF_LEN, WDDX_VAR_S,
PHP_CLASS_NAME_VAR);
php_wddx_add_chunk(packet, tmp_buf);
php_wddx_add_chunk_static(packet, WDDX_STRING_S);
php_wddx_add_chunk_ex(packet, class_name, name_len);
@@ -480,7 +480,7 @@
PHP_SET_CLASS_ATTRIBUTES(obj);
php_wddx_add_chunk_static(packet, WDDX_STRUCT_S);
- sprintf(tmp_buf, WDDX_VAR_S, PHP_CLASS_NAME_VAR);
+ snprintf(tmp_buf, WDDX_BUF_LEN, WDDX_VAR_S, PHP_CLASS_NAME_VAR);
php_wddx_add_chunk(packet, tmp_buf);
php_wddx_add_chunk_static(packet, WDDX_STRING_S);
php_wddx_add_chunk_ex(packet, class_name, name_len);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
