summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-09-13 14:14:24 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-09-13 14:14:24 (GMT)
commita52254cce90676f1acd02bdc56201dc5956a1700 (patch)
treefc453bda2f67405f0a05f5521bd816fcb454f85d
parenta8bbc9486a4349842378729f3c406b5827828f5b (diff)
parentbcb4faa32f68f2208263d681a889790755085ac7 (diff)
downloadtcl-a52254cce90676f1acd02bdc56201dc5956a1700.zip
tcl-a52254cce90676f1acd02bdc56201dc5956a1700.tar.gz
tcl-a52254cce90676f1acd02bdc56201dc5956a1700.tar.bz2
merge 8.5; update changes
-rw-r--r--changes2
-rw-r--r--generic/tclExecute.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/changes b/changes
index 7376ba6..5d6ef97 100644
--- a/changes
+++ b/changes
@@ -7788,4 +7788,6 @@ Many revisions to better support a Cygwin environment (nijtmans)
2013-09-07 (bug fix)[86ceb4] have tm path favor first provider (neumann,porter)
+2013-09-13 (bug fix)[bdd91c] crash in exec stack mem management (azazel)
+
--- Released 8.5.15, September 16, 2013 --- http://core.tcl.tk/tcl/ for details
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 8fb8e63..e657828 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -2311,6 +2311,7 @@ TclExecuteByteCode(
initCatchTop += moved;
catchTop += moved;
+ bcFramePtr = (CmdFrame *) (initCatchTop + codePtr->maxExceptDepth + 1);
initTosPtr += moved;
tosPtr += moved;
esPtr = iPtr->execEnvPtr->execStackPtr;