Author: zwoop
Date: Wed Sep 7 23:45:35 2011
New Revision: 1166474
URL: http://svn.apache.org/viewvc?rev=1166474&view=rev
Log:
TS-567 Fix some obvious misuses of free()
Modified:
trafficserver/traffic/trunk/example/remap/remap.cc
trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc
trafficserver/traffic/trunk/lib/ts/SimpleTokenizer.h
trafficserver/traffic/trunk/lib/wccp/WccpMsg.cc
trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc
trafficserver/traffic/trunk/mgmt/cli/ShowCmd.cc
trafficserver/traffic/trunk/mgmt/cli/cliParseArg.cc
trafficserver/traffic/trunk/mgmt/tools/SysAPI.cc
trafficserver/traffic/trunk/proxy/ControlBase.cc
trafficserver/traffic/trunk/proxy/CoreUtils.cc
trafficserver/traffic/trunk/proxy/InkAPITestTool.cc
trafficserver/traffic/trunk/proxy/ParentSelection.cc
trafficserver/traffic/trunk/proxy/StufferUdpReceiver.cc
trafficserver/traffic/trunk/proxy/hdrs/load_http_hdr.cc
trafficserver/traffic/trunk/proxy/http/HttpMessageBody.cc
Modified: trafficserver/traffic/trunk/example/remap/remap.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/remap/remap.cc?rev=1166474&r1=1166473&r2=1166474&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/remap/remap.cc (original)
+++ trafficserver/traffic/trunk/example/remap/remap.cc Wed Sep 7 23:45:35 2011
@@ -101,11 +101,9 @@ remap_entry::~remap_entry()
int i;
if (argc && argv) {
- for (i = 0; i < argc; i++) {
- if (argv[i])
- free(argv[i]);
- }
- free(argv);
+ for (i = 0; i < argc; i++)
+ ats_free(argv[i]);
+ ats_free(argv);
}
}
Modified: trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc?rev=1166474&r1=1166473&r2=1166474&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc Wed Sep 7 23:45:35
2011
@@ -330,7 +330,7 @@ _zorch_file(void *arg)
break;
info->fsize += amount;
}
- free(vals);
+ ats_free(vals);
}
delete info;
ink_atomic_increment((int *) &nzorchers, -1);
Modified: trafficserver/traffic/trunk/lib/ts/SimpleTokenizer.h
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/SimpleTokenizer.h?rev=1166474&r1=1166473&r2=1166474&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/SimpleTokenizer.h (original)
+++ trafficserver/traffic/trunk/lib/ts/SimpleTokenizer.h Wed Sep 7 23:45:35
2011
@@ -198,7 +198,7 @@ private:
void _clearData()
{
if (_data && !(_mode & OVERWRITE_INPUT_STRING)) {
- free(_data);
+ ats_free(_data);
}
}
Modified: trafficserver/traffic/trunk/lib/wccp/WccpMsg.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/wccp/WccpMsg.cc?rev=1166474&r1=1166473&r2=1166474&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/wccp/WccpMsg.cc (original)
+++ trafficserver/traffic/trunk/lib/wccp/WccpMsg.cc Wed Sep 7 23:45:35 2011
@@ -92,7 +92,8 @@ size_t CacheIdBox::getSize() const { ret
CacheIdBox&
CacheIdBox::require(size_t n) {
if (m_cap < n) {
- if (m_base && m_cap) free(m_base);
+ if (m_base && m_cap)
+ ats_free(m_base);
m_base = static_cast<CacheIdElt*>(ats_malloc(n));
m_cap = n;
}
@@ -1536,11 +1537,10 @@ detail::Assignment::fill(cache::GroupDat
// we don't have to do space checks when those get filled out.
// The mask assignment is more difficult. We just guess generously and
// try to recover if we go over.
- size_t size = RouterAssignListElt::calcSize(n_routers)
- + HashAssignElt::calcSize(n_caches)
- + 4096;
+ size_t size = RouterAssignListElt::calcSize(n_routers) +
HashAssignElt::calcSize(n_caches) + 4096;
+
if (m_buffer.getSize() < size) {
- free(m_buffer.getBase());
+ ats_free(m_buffer.getBase());
m_buffer.set(ats_malloc(size), size);
}
m_buffer.reset();
Modified: trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc?rev=1166474&r1=1166473&r2=1166474&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc (original)
+++ trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc Wed Sep 7 23:45:35 2011
@@ -247,8 +247,10 @@ Cmd_Config(ClientData clientData, Tcl_In
cmdinfo[i] = 0;
Cli_Printf("Following are the available config commands\n");
Cli_Printf(cmdinfo + strlen("config "));
- free(cmdinfo);
- free(temp);
+
+ ats_free(cmdinfo);
+ ats_free(temp);
+
return CLI_OK;
}
Modified: trafficserver/traffic/trunk/mgmt/cli/ShowCmd.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli/ShowCmd.cc?rev=1166474&r1=1166473&r2=1166474&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli/ShowCmd.cc (original)
+++ trafficserver/traffic/trunk/mgmt/cli/ShowCmd.cc Wed Sep 7 23:45:35 2011
@@ -92,8 +92,10 @@ Cmd_Show(ClientData clientData, Tcl_Inte
cmdinfo[i] = 0;
Cli_Printf("Following are the available show commands\n");
Cli_Printf(cmdinfo + strlen("show "));
- free(cmdinfo);
- free(temp);
+
+ ats_free(cmdinfo);
+ ats_free(temp);
+
return 0;
}
Modified: trafficserver/traffic/trunk/mgmt/cli/cliParseArg.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli/cliParseArg.cc?rev=1166474&r1=1166473&r2=1166474&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli/cliParseArg.cc (original)
+++ trafficserver/traffic/trunk/mgmt/cli/cliParseArg.cc Wed Sep 7 23:45:35 2011
@@ -129,12 +129,12 @@ cliParseArgument(int argc, const char **
parsedArgTable[i].arg_int = CLI_DEFAULT_INT_OR_FLOAT_VALUE;
if (parsedArgTable[i].data && (parsedArgTable[i].data != (char *) NULL)) {
- free(parsedArgTable[i].data);
+ ats_free(parsedArgTable[i].data);
parsedArgTable[i].data = (char *) NULL;
}
if (parsedArgTable[i].arg_string && parsedArgTable[i].arg_string != (char
*) NULL) {
- free(parsedArgTable[i].arg_string);
+ ats_free(parsedArgTable[i].arg_string);
parsedArgTable[i].arg_string = (char *) NULL;
}
}
@@ -178,7 +178,7 @@ cliParseArgument(int argc, const char **
if (prevMatchPtr != NULL && prevPtr == prevMatchPtr) {
if (prevMatchPtr->type == CLI_ARGV_OPTION_NAME_VALUE) {
if (prev_parsedInfoPtr->arg_string) {
- free(prev_parsedInfoPtr->arg_string);
+ ats_free(prev_parsedInfoPtr->arg_string);
prev_parsedInfoPtr->arg_string = NULL;
}
}
Modified: trafficserver/traffic/trunk/mgmt/tools/SysAPI.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/tools/SysAPI.cc?rev=1166474&r1=1166473&r2=1166474&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/tools/SysAPI.cc (original)
+++ trafficserver/traffic/trunk/mgmt/tools/SysAPI.cc Wed Sep 7 23:45:35 2011
@@ -1331,7 +1331,7 @@ Net_SetEncryptedRootPassword(char *passw
strtok_r(buf, ":", &remainingTokens);
strtok_r(NULL, ":", &remainingTokens);
fprintf(tmp, "root:%s:%s", password, remainingTokens);
- free(buf);
+ ats_free(buf);
}
}
NOWARN_UNUSED_RETURN(fgets(buffer, 1024, fp));
Modified: trafficserver/traffic/trunk/proxy/ControlBase.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ControlBase.cc?rev=1166474&r1=1166473&r2=1166474&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ControlBase.cc (original)
+++ trafficserver/traffic/trunk/proxy/ControlBase.cc Wed Sep 7 23:45:35 2011
@@ -351,7 +351,7 @@ void TextMod::print(FILE* f) const {
TextMod::TextMod() : text(0,0) {}
TextMod::~TextMod() {
- if (text.data()) free(text.data());
+ free(text.data());
}
// ----------
Modified: trafficserver/traffic/trunk/proxy/CoreUtils.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/CoreUtils.cc?rev=1166474&r1=1166473&r2=1166474&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/CoreUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/CoreUtils.cc Wed Sep 7 23:45:35 2011
@@ -309,10 +309,10 @@ CoreUtils::read_from_core(intptr_t vaddr
*buf++ = getc(fp);
}
buf -= bytes;*/
- free(frameoff);
+ ats_free(frameoff);
return bytes;
}
- free(frameoff);
+ ats_free(frameoff);
}
} else
return -1;
@@ -360,7 +360,7 @@ CoreUtils::get_base_frame(intptr_t threa
framep = regs.rw_in[6];
coress->framep = framep;
}
- free(frameoff);
+ ats_free(frameoff);
} else {
printf("Failed to seek to top of the stack\n");
}
@@ -406,7 +406,7 @@ CoreUtils::get_next_frame(core_stack_sta
coress->framep = framep;
}
}
- free(frameoff);
+ ats_free(frameoff);
}
}
return 1;
@@ -474,7 +474,7 @@ CoreUtils::get_base_frame(intptr_t frame
}
}
}
- free(frameoff);
+ ats_free(frameoff);
}
} else {
printf("Failed to seek to top of the stack\n");
@@ -504,7 +504,7 @@ CoreUtils::get_next_frame(core_stack_sta
if (fread(frameoff, 4, 1, fp) == 1) {
coress->framep = (intptr_t) *frameoff;
if (*frameoff == NULL) {
- free(frameoff);
+ ats_free(frameoff);
return 0;
}
if (fread(frameoff, 4, 1, fp) == 1) {
@@ -516,7 +516,7 @@ CoreUtils::get_next_frame(core_stack_sta
}
}
}
- free(frameoff);
+ ats_free(frameoff);
}
return 1;
}
@@ -631,7 +631,7 @@ CoreUtils::process_HttpSM(HttpSM * core_
if (read_from_core((intptr_t) core_ptr, sizeof(HttpSM), (char *) http_sm)
< 0) {
// This is not 64-bit correct ... /leif
printf("ERROR: Failed to read httpSM @ 0x%p from core\n", core_ptr);
- free(http_sm);
+ ats_free(http_sm);
return;
}
@@ -673,7 +673,7 @@ CoreUtils::process_HttpSM(HttpSM * core_
}
}
- free(http_sm);
+ ats_free(http_sm);
} else
printf("process_HttpSM : last_seen_http_sm == core_ptr\n");
}
@@ -806,7 +806,7 @@ CoreUtils::load_http_hdr(HTTPHdr * core_
char *free_start = (char *) (((HdrStrHeap *) str_hdr)->m_free_start);
int nto_copy = abs((char *) copy_start - free_start);
- free(str_hdr);
+ ats_free(str_hdr);
#if defined(__GNUC__)
char rw_heap[sizeof(char) * nto_copy];
#else
@@ -986,7 +986,7 @@ CoreUtils::process_EThread(EThread * eth
// printf(" NetHandler: 0x%x\n\n", (int) loaded_eth->netHandler);
}
- free(buf);
+ ats_free(buf);
}
static void
@@ -1020,7 +1020,7 @@ CoreUtils::process_NetVC(UnixNetVConnect
print_netstate(&loaded_nvc->write);
}
- free(buf);
+ ats_free(buf);
}
@@ -1194,7 +1194,7 @@ process_core(char *fname)
size -= len;
}
}
- free(nhdr);
+ ats_free(nhdr);
}
}
}
@@ -1352,7 +1352,7 @@ process_core(char *fname)
size -= len;
}
}
- free(nhdr);
+ ats_free(nhdr);
}
}
}
Modified: trafficserver/traffic/trunk/proxy/InkAPITestTool.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPITestTool.cc?rev=1166474&r1=1166473&r2=1166474&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPITestTool.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPITestTool.cc Wed Sep 7 23:45:35 2011
@@ -459,9 +459,8 @@ synclient_txn_delete(ClientTxn * txn)
TSActionCancel(txn->connect_action);
txn->connect_action = NULL;
}
- if (txn->request) {
- free(txn->request);
- }
+
+ ats_free(txn->request);
txn->magic = MAGIC_DEAD;
TSfree(txn);
return 1;
Modified: trafficserver/traffic/trunk/proxy/ParentSelection.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ParentSelection.cc?rev=1166474&r1=1166473&r2=1166474&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ParentSelection.cc (original)
+++ trafficserver/traffic/trunk/proxy/ParentSelection.cc Wed Sep 7 23:45:35
2011
@@ -724,7 +724,7 @@ ParentRecord::DefaultInit(char *val)
//
// Returns NULL if everything is OK
// Otherwise, returns an error string that the caller MUST
-// DEALLOCATE with free()
+// DEALLOCATE with ats_free()
//
char *
ParentRecord::Init(matcher_line * line_info)
Modified: trafficserver/traffic/trunk/proxy/StufferUdpReceiver.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/StufferUdpReceiver.cc?rev=1166474&r1=1166473&r2=1166474&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/StufferUdpReceiver.cc (original)
+++ trafficserver/traffic/trunk/proxy/StufferUdpReceiver.cc Wed Sep 7 23:45:35
2011
@@ -312,7 +312,7 @@ main(int argc, char *argv[])
if ((bind(fd, (struct sockaddr *) &saddr, sizeof(saddr))) < 0) {
perror("bind(udp_fd)");
- free(pkt_buf);
+ ats_free(pkt_buf);
return 0;
}
@@ -331,5 +331,5 @@ main(int argc, char *argv[])
stream_hash_table->deleteStaleStreams(now);
}
- free(pkt_buf);
+ ats_free(pkt_buf);
}
Modified: trafficserver/traffic/trunk/proxy/hdrs/load_http_hdr.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/load_http_hdr.cc?rev=1166474&r1=1166473&r2=1166474&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/load_http_hdr.cc (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/load_http_hdr.cc Wed Sep 7 23:45:35
2011
@@ -101,13 +101,13 @@ process_http_hdr_impl(HdrHeapObjImpl * o
printf(" is a request hdr\n");
s = load_string(hhdr->u.req.m_ptr_method, hhdr->u.req.m_len_method,
offset);
printf(" method: %s\n", s);
- free(s);
+ ats_free(s);
} else if (hhdr->m_polarity == HTTP_TYPE_RESPONSE) {
printf(" is a response hdr\n");
printf(" status code: %d\n", (int) hhdr->u.resp.m_status);
s = load_string(hhdr->u.resp.m_ptr_reason, hhdr->u.resp.m_len_reason,
offset);
printf(" method: %s\n", s);
- free(s);
+ ats_free(s);
}
}
@@ -133,8 +133,8 @@ process_mime_block_impl(MIMEFieldBlockIm
}
v = load_string(f->m_ptr_value, f->m_len_value, offset);
printf(" (%d) %s: %s\n", i, n, v);
- free(n);
- free(v);
+ ats_free(n);
+ ats_free(v);
}
}
Modified: trafficserver/traffic/trunk/proxy/http/HttpMessageBody.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpMessageBody.cc?rev=1166474&r1=1166473&r2=1166474&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpMessageBody.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpMessageBody.cc Wed Sep 7
23:45:35 2011
@@ -38,7 +38,7 @@ HttpMessageBody::StatusCodeName(HTTPStat
(using malloc), and places the result body in the buffer. The body
will be NUL terminated.
- The caller must free() the returned object when done.
+ The caller must ats_free() the returned object when done.
The reason string allows you to override the default reason phrase for
the status code. If it is NULL, the default is used. If format is NULL
