tony2001 Thu Jan 18 16:21:00 2007 UTC
Modified files:
/php-src/ext/soap soap.c
/php-src/ext/standard html.c
/php-src/ext/wddx wddx.c
Log:
more snprintf()
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.217&r2=1.218&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.217 php-src/ext/soap/soap.c:1.218
--- php-src/ext/soap/soap.c:1.217 Mon Jan 1 09:29:29 2007
+++ php-src/ext/soap/soap.c Thu Jan 18 16:20:59 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.217 2007/01/01 09:29:29 sebastian Exp $ */
+/* $Id: soap.c,v 1.218 2007/01/18 16:20:59 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2134,7 +2134,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);
@@ -2303,7 +2303,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);
@@ -4706,7 +4706,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.121&r2=1.122&diff_format=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.121 php-src/ext/standard/html.c:1.122
--- php-src/ext/standard/html.c:1.121 Mon Jan 1 09:29:31 2007
+++ php-src/ext/standard/html.c Thu Jan 18 16:21:00 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: html.c,v 1.121 2007/01/01 09:29:31 sebastian Exp $ */
+/* $Id: html.c,v 1.122 2007/01/18 16:21:00 tony2001 Exp $ */
/*
* HTML entity resources:
@@ -1427,12 +1427,12 @@
cp = (UChar)(i +
entity_map[j].basechar);
key_len =
zend_codepoint_to_uchar(cp, key);
key[key_len] = 0;
- sprintf(buffer, "&%s;",
entity_map[j].table[i]);
+ snprintf(buffer,
sizeof(buffer), "&%s;", entity_map[j].table[i]);
add_u_assoc_ascii_string_ex(return_value, IS_UNICODE, ZSTR(key), key_len+1,
buffer, 1);
} else {
/* no wide chars here, because
charset is always cs_8859_1 */
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.142&r2=1.143&diff_format=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.142 php-src/ext/wddx/wddx.c:1.143
--- php-src/ext/wddx/wddx.c:1.142 Tue Jan 9 15:21:23 2007
+++ php-src/ext/wddx/wddx.c Thu Jan 18 16:21:00 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: wddx.c,v 1.142 2007/01/09 15:21:23 iliaa Exp $ */
+/* $Id: wddx.c,v 1.143 2007/01/18 16:21:00 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -449,7 +449,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.s, name_len);
@@ -481,7 +481,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.s, name_len);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
