Author: igalic
Date: Sat Sep 17 23:19:20 2011
New Revision: 1172146
URL: http://svn.apache.org/viewvc?rev=1172146&view=rev
Log:
TS-953: consolidate string copy/concat for mgmt/web2
Modified:
trafficserver/traffic/trunk/mgmt/web2/WebCompatibility.cc
trafficserver/traffic/trunk/mgmt/web2/WebHttp.cc
trafficserver/traffic/trunk/mgmt/web2/WebHttpMessage.cc
trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc
trafficserver/traffic/trunk/mgmt/web2/WebOverview.cc
Modified: trafficserver/traffic/trunk/mgmt/web2/WebCompatibility.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/WebCompatibility.cc?rev=1172146&r1=1172145&r2=1172146&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/WebCompatibility.cc (original)
+++ trafficserver/traffic/trunk/mgmt/web2/WebCompatibility.cc Sat Sep 17
23:19:20 2011
@@ -39,7 +39,6 @@ char *
WebGetHostname_Xmalloc(sockaddr_in * client_info)
{
ink_gethostbyaddr_r_data data;
- char *hostname;
char *hostname_tmp;
struct hostent *r = ink_gethostbyaddr_r((char *)
&client_info->sin_addr.s_addr,
@@ -48,11 +47,7 @@ WebGetHostname_Xmalloc(sockaddr_in * cli
&data);
hostname_tmp = r ? r->h_name : inet_ntoa(client_info->sin_addr);
- size_t len = strlen(hostname_tmp) + 1;
- hostname = (char *)ats_malloc(len);
- ink_strncpy(hostname, hostname_tmp, len);
-
- return hostname;
+ return ats_strdup(hostname_tmp);
}
Modified: trafficserver/traffic/trunk/mgmt/web2/WebHttp.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/WebHttp.cc?rev=1172146&r1=1172145&r2=1172146&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/WebHttp.cc (original)
+++ trafficserver/traffic/trunk/mgmt/web2/WebHttp.cc Sat Sep 17 23:19:20 2011
@@ -120,7 +120,7 @@ adjustCmdLine(char *cmdLine, int cmdline
if (interpreter) {
snprintf(cmdLine, cmdline_len, "\"%s\" \"%s\"", interpreter, cgiFullPath);
} else {
- ink_strncpy(cmdLine, cgiFullPath, cmdline_len);
+ ink_strlcpy(cmdLine, cgiFullPath, cmdline_len);
}
return;
}
Modified: trafficserver/traffic/trunk/mgmt/web2/WebHttpMessage.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/WebHttpMessage.cc?rev=1172146&r1=1172145&r2=1172146&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/WebHttpMessage.cc (original)
+++ trafficserver/traffic/trunk/mgmt/web2/WebHttpMessage.cc Sat Sep 17 23:19:20
2011
@@ -223,7 +223,7 @@ httpMessage::addRequestLine(char *reques
// of the URI along with the query if any
unsigned int amtToAllocate = strlen(URI) + 1;
file = new char[amtToAllocate];
- ink_strncpy(file, URI, amtToAllocate);
+ ink_strlcpy(file, URI, amtToAllocate + 1);
tmp = strstr(file, "?");
if (tmp != NULL) {
// There is a form submission
@@ -260,24 +260,24 @@ httpMessage::addHeader(char *hdr)
} else if (strncasecmp("Referer:", hdrName, 8) == 0) {
unsigned int amtToAllocate = strlen(hdrArg1);
referer = new char[amtToAllocate + 1];
- ink_strncpy(referer, hdrArg1, amtToAllocate);
+ ink_strlcpy(referer, hdrArg1, amtToAllocate + 1);
} else if (strncasecmp("Content-type:", hdrName, 13) == 0) {
unsigned int amtToAllocate = strlen(hdrArg1);
conType_str = new char[amtToAllocate + 1];
- ink_strncpy(conType_str, hdrArg1, amtToAllocate);
+ ink_strlcpy(conType_str, hdrArg1, amtToAllocate + 1);
} else if (strncasecmp("Authorization:", hdrName, 14) == 0) {
authType = hdrArg1;
if (strcmp(authType, "Basic") == 0) {
auth = (*parser)[2];
len = strlen(auth) + 1;
authMessage = new char[len];
- ink_strncpy(authMessage, auth, len - 1);
+ ink_strlcpy(authMessage, auth, len);
}
} else if (strncasecmp("If-Modified-Since:", hdrName, 18) == 0) {
// Disabled due to thread safety issues
getModDate();
- }
- }
+ }
+}
// httpMessage::getModDate()
@@ -318,7 +318,7 @@ httpMessage::getModDate()
// Rebuild the date string from the parsed
// stuff
for (i = 0; i < numDateFields; i++) {
- strncat(dateStr, (*parser)[i + 1], dateSize + numDateFields -
strlen(dateStr));
+ ink_strlcat(dateStr, (*parser)[i + 1], dateSize + 1);
tmpLen = strlen(dateStr);
dateStr[tmpLen] = ' ';
dateStr[tmpLen + 1] = '\0';
Modified: trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc?rev=1172146&r1=1172145&r2=1172146&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc (original)
+++ trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc Sat Sep 17 23:19:20
2011
@@ -172,7 +172,7 @@ newUNIXsocket(char *fpath)
}
serv_addr.sun_family = AF_UNIX;
- ink_strncpy(serv_addr.sun_path, fpath, sizeof(serv_addr.sun_path));
+ ink_strlcpy(serv_addr.sun_path, fpath, sizeof(serv_addr.sun_path));
#if defined(darwin) || defined(freebsd)
servlen = sizeof(struct sockaddr_un);
#else
Modified: trafficserver/traffic/trunk/mgmt/web2/WebOverview.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/WebOverview.cc?rev=1172146&r1=1172145&r2=1172146&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/WebOverview.cc (original)
+++ trafficserver/traffic/trunk/mgmt/web2/WebOverview.cc Sat Sep 17 23:19:20
2011
@@ -92,7 +92,7 @@ overviewRecord::overviewRecord(unsigned
const size_t hostNameLen = strlen(name_l) + 1;
this->hostname = new char[hostNameLen];
- ink_strncpy(this->hostname, name_l, hostNameLen);
+ ink_strlcpy(this->hostname, name_l, hostNameLen);
ats_free(name_l);
}
@@ -469,10 +469,8 @@ overviewRecord::varStrFromName(const cha
data.string_data = this->readString(varName, &found);
if (data.string_data == NULL) {
bufVal[0] = '\0';
- } else if (strlen(data.string_data) < (size_t) (bufLen - 1)) {
- ink_strncpy(bufVal, data.string_data, bufLen);
} else {
- ink_strncpy(bufVal, data.string_data, bufLen);
+ ink_strlcpy(bufVal, data.string_data, bufLen);
}
ats_free(data.string_data);
break;
