From 97c8b1d13e4d69e646a4b061eb08fb0495e38e79 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Thu, 18 Jan 2007 16:21:00 +0000 Subject: [PATCH] more snprintf() --- ext/soap/soap.c | 6 +++--- ext/standard/html.c | 4 ++-- ext/wddx/wddx.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 5edda73a93..88bb04ef08 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -2134,7 +2134,7 @@ PHP_METHOD(SoapServer, handle) 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 @@ static void soap_server_fault_ex(sdlFunctionPtr function, zval* fault, soapHeade 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 @@ static xmlNodePtr serialize_parameter(sdlParamPtr param, zval *param_val, int in } else { if (name == NULL) { paramName = paramNameBuf; - sprintf(paramName,"param%d",index); + snprintf(paramName, sizeof(paramNameBuf), "param%d",index); } else { paramName = name; } diff --git a/ext/standard/html.c b/ext/standard/html.c index 120b5411f1..30770f2dc2 100644 --- a/ext/standard/html.c +++ b/ext/standard/html.c @@ -1427,12 +1427,12 @@ PHP_FUNCTION(get_html_translation_table) 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); } } diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index 960b593226..1dc21e0ca9 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -449,7 +449,7 @@ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj) 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 @@ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj) 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); -- 2.40.0