----- zw...@apache.org wrote: > Author: zwoop > Date: Sun Jan 8 22:58:04 2012 > New Revision: 1228991 > > URL: http://svn.apache.org/viewvc?rev=1228991&view=rev > Log: > TS-1038 TSHttpTxnErrorBodySet() can leak memory. Author: Brian Geffon > > Modified: > trafficserver/traffic/trunk/CHANGES > trafficserver/traffic/trunk/proxy/InkAPI.cc > > Modified: trafficserver/traffic/trunk/CHANGES > URL: > http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1228991&r1=1228990&r2=1228991&view=diff > ============================================================================== > --- trafficserver/traffic/trunk/CHANGES (original) > +++ trafficserver/traffic/trunk/CHANGES Sun Jan 8 22:58:04 2012 > @@ -1,5 +1,8 @@ > -*- coding: utf-8 -*- > Changes with Apache Traffic Server 3.1.2 > + *) [TS-1038] SHttpTxnErrorBodySet() can leak memory. > + Author: Brian Geffon > + > *) [TS-1049] TS hangs (dead lock) on HTTPS POST requests. > Author: Wilson Ho > > > Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc > URL: > http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=1228991&r1=1228990&r2=1228991&view=diff > ============================================================================== > --- trafficserver/traffic/trunk/proxy/InkAPI.cc (original) > +++ trafficserver/traffic/trunk/proxy/InkAPI.cc Sun Jan 8 22:58:04 2012 > @@ -5378,6 +5378,11 @@ TSHttpTxnErrorBodySet(TSHttpTxn txnp, ch > if (s->internal_msg_buffer) > HttpTransact::free_internal_msg_buffer(s->internal_msg_buffer, > s->internal_msg_buffer_fast_allocator_size); > > + if (s->internal_msg_buffer_type) { > + ats_free(s->internal_msg_buffer_type); > + s->internal_msg_buffer_type = NULL; > + } > +
this whole block can be replaced with ats_free_null(s->internal_msg_buffer_type); > s->internal_msg_buffer = buf; > s->internal_msg_buffer_type = mimetype; > s->internal_msg_buffer_size = buflength; > > -- Igor Gali? Tel: +43 (0) 664 886 22 883 Mail: i.ga...@brainsware.org URL: http://brainsware.org/ GPG: 6880 4155 74BD FD7C B515 2EA5 4B1D 9E08 A097 C9AE
