diff options
author | msofer <msofer@noemail.net> | 2004-03-29 02:17:58 (GMT) |
---|---|---|
committer | msofer <msofer@noemail.net> | 2004-03-29 02:17:58 (GMT) |
commit | b1bd0b736c9ea7eb548b981b549d29d009303f85 (patch) | |
tree | f29ffea15b5c1068e38c10ed20ab408d2a916114 /generic/tclCompile.c | |
parent | 0da564c4dba2f623e286513c7143dd5feabaf168 (diff) | |
download | tcl-b1bd0b736c9ea7eb548b981b549d29d009303f85.zip tcl-b1bd0b736c9ea7eb548b981b549d29d009303f85.tar.gz tcl-b1bd0b736c9ea7eb548b981b549d29d009303f85.tar.bz2 |
* generic/tclCompile.c (TclCompileScript): corrected possible
segfault when a compilation returns TCL_OUTLINE_COMPILE after
having grown the compile environment [Bug 925121].
FossilOrigin-Name: 5302a8b135a544a0f7acff85fc89d7409347c554
Diffstat (limited to 'generic/tclCompile.c')
-rw-r--r-- | generic/tclCompile.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/generic/tclCompile.c b/generic/tclCompile.c index a244be9..b1bd38e 100644 --- a/generic/tclCompile.c +++ b/generic/tclCompile.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclCompile.c,v 1.43.2.4 2004/03/15 20:34:13 msofer Exp $ + * RCS: @(#) $Id: tclCompile.c,v 1.43.2.5 2004/03/29 02:17:59 msofer Exp $ */ #include "tclInt.h" @@ -990,7 +990,8 @@ TclCompileScript(interp, script, numBytes, nested, envPtr) && !(cmdPtr->flags & CMD_HAS_EXEC_TRACES) && !(iPtr->flags & DONT_COMPILE_CMDS_INLINE)) { int savedNumCmds = envPtr->numCommands; - unsigned char *savedCodeNext = envPtr->codeNext; + unsigned int savedCodeNext = + envPtr->codeNext - envPtr->codeStart; code = (*(cmdPtr->compileProc))(interp, &parse, envPtr); @@ -1003,7 +1004,7 @@ TclCompileScript(interp, script, numBytes, nested, envPtr) * TCL_OUT_LINE_COMPILE [Bugs 705406 and 735055] */ envPtr->numCommands = savedNumCmds; - envPtr->codeNext = savedCodeNext; + envPtr->codeNext = envPtr->codeStart + savedCodeNext; } else { /* an error */ /* * There was a compilation error, the last |