diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-03-01 16:45:01 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-03-01 16:45:01 (GMT) |
| commit | 2ed7c8372b29c30467402db75b20a21f9577a451 (patch) | |
| tree | f780a4fc2384f155fb49a9e432d1f54f4d1afe77 /generic/tclVar.c | |
| parent | b3c0cd4c86eb8e8357649afa597ec9f6b533be6a (diff) | |
| parent | 5be04ec11ef9378c093c4403bc37ee5e8955de2a (diff) | |
| download | tcl-2ed7c8372b29c30467402db75b20a21f9577a451.zip tcl-2ed7c8372b29c30467402db75b20a21f9577a451.tar.gz tcl-2ed7c8372b29c30467402db75b20a21f9577a451.tar.bz2 | |
[80304238ac] Prevent RC cycle in the localVarName objtype.
Diffstat (limited to 'generic/tclVar.c')
| -rw-r--r-- | generic/tclVar.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/generic/tclVar.c b/generic/tclVar.c index 451ef7b..5574f30 100644 --- a/generic/tclVar.c +++ b/generic/tclVar.c @@ -697,13 +697,16 @@ 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 + || cachedNamePtr->internalRep.twoPtrValue.ptr1 != NULL) { + TclFreeIntRep(cachedNamePtr); + } } else { part1Ptr->internalRep.twoPtrValue.ptr1 = NULL; } |