From e31370213070e90006eb4aae378d73945eec6d51 Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 26 Feb 2016 15:42:33 +0000 Subject: [80304238ac] Candidate fix for memleak due to RC cycle. --- generic/tclVar.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/generic/tclVar.c b/generic/tclVar.c index 451ef7b..12e52c2 100644 --- a/generic/tclVar.c +++ b/generic/tclVar.c @@ -697,13 +697,15 @@ TclObjLookupVarEx( /* * An indexed local variable. */ + Tcl_Obj *cachedNamePtr = localName(iPtr->varFramePtr, index); part1Ptr->typePtr = &localVarNameType; - if (part1Ptr != localName(iPtr->varFramePtr, index)) { - part1Ptr->internalRep.twoPtrValue.ptr1 = - localName(iPtr->varFramePtr, index); - Tcl_IncrRefCount((Tcl_Obj *) - part1Ptr->internalRep.twoPtrValue.ptr1); + if (part1Ptr != cachedNamePtr) { + part1Ptr->internalRep.twoPtrValue.ptr1 = cachedNamePtr; + Tcl_IncrRefCount(cachedNamePtr); + if (cachedNamePtr->typePtr != &localVarNameType) { + TclFreeIntRep(cachedNamePtr); + } } else { part1Ptr->internalRep.twoPtrValue.ptr1 = NULL; } -- cgit v0.12