Author: igalic
Date: Thu Sep 22 13:21:59 2011
New Revision: 1174114
URL: http://svn.apache.org/viewvc?rev=1174114&view=rev
Log:
TS-953: consolidate string copy/concat for the iocore/net.
Modified:
trafficserver/traffic/trunk/iocore/net/NetTest-http-server.c
trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc
trafficserver/traffic/trunk/iocore/net/SSLNet.cc
trafficserver/traffic/trunk/iocore/net/test_I_Net.cc
trafficserver/traffic/trunk/iocore/net/test_I_UDPNet.cc
trafficserver/traffic/trunk/iocore/net/test_P_UDPNet.cc
Modified: trafficserver/traffic/trunk/iocore/net/NetTest-http-server.c
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/NetTest-http-server.c?rev=1174114&r1=1174113&r2=1174114&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/NetTest-http-server.c (original)
+++ trafficserver/traffic/trunk/iocore/net/NetTest-http-server.c Thu Sep 22
13:21:59 2011
@@ -185,7 +185,7 @@ test_main()
resp_blk = new_IOBufferBlock();
resp_blk->alloc(6);
char *b = resp_blk->start();
- strcpy(b, response_hdr);
+ ink_strlcpy(b, response_hdr, resp_blk->block_size());
memset(b + strlen(response_hdr), 'x', 8000);
resp_blk->fill(doc_len = strlen(response_hdr) + 8000);
Modified: trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc?rev=1174114&r1=1174113&r2=1174114&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc Thu Sep 22 13:21:59
2011
@@ -163,7 +163,7 @@ SSLCertLookup::extractIPAndCert(matcher_
int buf_len = sizeof(char) * (strlen(value) + 1);
*addr = (char *)ats_malloc(buf_len);
- ink_strncpy(*addr, (const char *) value, buf_len);
+ ink_strlcpy(*addr, (const char *) value, buf_len);
// testAddr = inet_addr (addr);
}
}
@@ -173,7 +173,7 @@ SSLCertLookup::extractIPAndCert(matcher_
int buf_len = sizeof(char) * (strlen(value) + 1);
*cert = (char *)ats_malloc(buf_len);
- ink_strncpy(*cert, (const char *) value, buf_len);
+ ink_strlcpy(*cert, (const char *) value, buf_len);
}
}
@@ -182,7 +182,7 @@ SSLCertLookup::extractIPAndCert(matcher_
int buf_len = sizeof(char) * (strlen(value) + 1);
*priKey = (char *)ats_malloc(buf_len);
- ink_strncpy(*priKey, (const char *) value, buf_len);
+ ink_strlcpy(*priKey, (const char *) value, buf_len);
}
}
}
Modified: trafficserver/traffic/trunk/iocore/net/SSLNet.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/SSLNet.cc?rev=1174114&r1=1174113&r2=1174114&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/SSLNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/SSLNet.cc Thu Sep 22 13:21:59 2011
@@ -364,7 +364,7 @@ SSLNetProcessor::initSSLServerCTX(SslCon
const size_t completeServerCertPathSize =
strlen(param->getServerCertPathOnly()) + strlen(serverCertPtr) + 1;
completeServerCertPath = (char *)ats_malloc(completeServerCertPathSize);
- ink_strncpy(completeServerCertPath, (const char *)
param->getServerCertPathOnly(), completeServerCertPathSize);
+ ink_strlcpy(completeServerCertPath, (const char *)
param->getServerCertPathOnly(), completeServerCertPathSize);
ink_strlcat(completeServerCertPath, serverCertPtr,
completeServerCertPathSize);
if (SSL_CTX_use_certificate_file(lCtx, completeServerCertPath,
SSL_FILETYPE_PEM) <= 0) {
logSSLError("Cannot use server certificate file");
Modified: trafficserver/traffic/trunk/iocore/net/test_I_Net.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/test_I_Net.cc?rev=1174114&r1=1174113&r2=1174114&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/test_I_Net.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/test_I_Net.cc Thu Sep 22 13:21:59
2011
@@ -98,7 +98,7 @@ init_diags(char *bdt, char *bat)
{
FILE *diags_log_fp;
char diags_logpath[500];
- strcpy(diags_logpath, DIAGS_LOG_FILE);
+ ink_strlcpy(diags_logpath, DIAGS_LOG_FILE, sizeof(diags_logpath));
diags_log_fp = fopen(diags_logpath, "w");
if (diags_log_fp) {
Modified: trafficserver/traffic/trunk/iocore/net/test_I_UDPNet.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/test_I_UDPNet.cc?rev=1174114&r1=1174113&r2=1174114&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/test_I_UDPNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/test_I_UDPNet.cc Thu Sep 22 13:21:59
2011
@@ -100,7 +100,7 @@ init_diags(char *bdt, char *bat)
{
FILE *diags_log_fp;
char diags_logpath[500];
- strcpy(diags_logpath, DIAGS_LOG_FILE);
+ ink_strlcpy(diags_logpath, DIAGS_LOG_FILE, sizeof(diags_logpath));
diags_log_fp = fopen(diags_logpath, "a+");
if (diags_log_fp) {
Modified: trafficserver/traffic/trunk/iocore/net/test_P_UDPNet.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/test_P_UDPNet.cc?rev=1174114&r1=1174113&r2=1174114&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/test_P_UDPNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/test_P_UDPNet.cc Thu Sep 22 13:21:59
2011
@@ -100,7 +100,7 @@ init_diags(char *bdt, char *bat)
{
FILE *diags_log_fp;
char diags_logpath[500];
- strcpy(diags_logpath, DIAGS_LOG_FILE);
+ ink_strlcpy(diags_logpath, DIAGS_LOG_FILE, sizeof(diags_logpath));
diags_log_fp = fopen(diags_logpath, "a+");
if (diags_log_fp) {
