From 0c8986dc65b0034df10a77db626ef663285574a3 Mon Sep 17 00:00:00 2001 From: apnadkarni Date: Fri, 17 May 2024 11:48:53 +0000 Subject: Free ChannelState.chanMsg .unreportedMsg --- generic/tclIO.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/generic/tclIO.c b/generic/tclIO.c index 2df8696..adcf513 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -157,7 +157,8 @@ typedef struct CloseCallback { static ChannelBuffer * AllocChannelBuffer(int length); static void PreserveChannelBuffer(ChannelBuffer *bufPtr); static void ReleaseChannelBuffer(ChannelBuffer *bufPtr); -static int IsShared(ChannelBuffer *bufPtr); +static void FreeChannelState(char *blockPtr); +static int IsShared(ChannelBuffer *bufPtr); static void ChannelFree(Channel *chanPtr); static void ChannelTimerProc(void *clientData); static int ChanRead(Channel *chanPtr, char *dst, int dstSize); @@ -2949,6 +2950,23 @@ FlushChannel( return errorCode; } +static void FreeChannelState(char *blockPtr) +{ + ChannelState *statePtr = (ChannelState *)blockPtr; + /* + * Bug [79474c588] leak. Possible other fields need freeing but + * not clear if they are already freed and if the fields are set to NULL + * when they are. Test suite shows no other leaks at the moment. + */ + if (statePtr->chanMsg) { + Tcl_DecrRefCount(statePtr->chanMsg); + } + if (statePtr->unreportedMsg) { + Tcl_DecrRefCount(statePtr->unreportedMsg); + } + ckfree(statePtr); +} + /* *---------------------------------------------------------------------- * @@ -3125,7 +3143,7 @@ CloseChannel( ChannelFree(chanPtr); - Tcl_EventuallyFree(statePtr, TCL_DYNAMIC); + Tcl_EventuallyFree(statePtr, FreeChannelState); return errorCode; } -- cgit v0.12