diff options
author | dgp <dgp@users.sourceforge.net> | 2011-07-15 14:55:07 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2011-07-15 14:55:07 (GMT) |
commit | f10d6c78e39de65787b2bb9652689feeca1b0b31 (patch) | |
tree | 5583d2b0d444df54a77c543be53f9bf644f1a6af /generic | |
parent | 8e85c7b1303dbaf54284cc641b20f6a77d7de502 (diff) | |
download | tcl-f10d6c78e39de65787b2bb9652689feeca1b0b31.zip tcl-f10d6c78e39de65787b2bb9652689feeca1b0b31.tar.gz tcl-f10d6c78e39de65787b2bb9652689feeca1b0b31.tar.bz2 |
3357771 Prevent circular references in values with ByteCode intreps.
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tclCompile.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/generic/tclCompile.c b/generic/tclCompile.c index 18679b2..8aedf95 100644 --- a/generic/tclCompile.c +++ b/generic/tclCompile.c @@ -2443,7 +2443,19 @@ TclInitByteCodeObj( p += TCL_ALIGN(codeBytes); /* align object array */ codePtr->objArrayPtr = (Tcl_Obj **) p; for (i = 0; i < numLitObjects; i++) { - codePtr->objArrayPtr[i] = envPtr->literalArrayPtr[i].objPtr; + if (objPtr == envPtr->literalArrayPtr[i].objPtr) { + /* + * Prevent circular reference where the bytecode intrep of + * a value contains a literal which is that same value. + * If this is allowed to happen, refcount decrements may not + * reach zero, and memory may leak. Bugs 467523, 3357771 + */ + codePtr->objArrayPtr[i] = Tcl_DuplicateObj(objPtr); + Tcl_IncrRefCount(codePtr->objArrayPtr[i]); + Tcl_DecrRefCount(objPtr); + } else { + codePtr->objArrayPtr[i] = envPtr->literalArrayPtr[i].objPtr; + } } p += TCL_ALIGN(objArrayBytes); /* align exception range array */ |