* generic/tclExecute.c (TclStackFree): insure that the execStack satisfies

"at most one free stack after the current one" when consecutive reallocs
caused the creation of intervening stacks.

2 files changed, 23 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index b00a325..ff75728 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-05  Miguel Sofer  <msofer@users.sf.net>
+
+	* generic/tclExecute.c (TclStackFree): insure that the execStack
+	satisfies "at most one free stack after the current one" when
+	consecutive reallocs caused the creation of intervening stacks.
+
 2011-03-05  Kevin B. Kenny  <kennykb@acm.org>
 
 	* generic/tclAssembly.c (new file):
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 5cffc90..ece8a8c 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -1235,19 +1235,28 @@ TclStackFree(
     }
 
     /*
-     * Return to previous stack.
+     * Return to previous active stack. Note that repeated expansions or
+     * reallocs could have generated several unused intervening stacks: free
+     * them too.
      */
 
-    esPtr->tosPtr = &esPtr->stackWords[-1];
-    if (esPtr->prevPtr) {
-	eePtr->execStackPtr = esPtr->prevPtr;
+    while (esPtr->nextPtr) {
+	esPtr = esPtr->nextPtr;
     }
-    if (esPtr->nextPtr) {
-	if (!esPtr->prevPtr) {
-	    eePtr->execStackPtr = esPtr->nextPtr;
+    esPtr->tosPtr = &esPtr->stackWords[-1];
+    while (esPtr->prevPtr) {
+	ExecStack *tmpPtr = esPtr->prevPtr;
+	if (tmpPtr->tosPtr == &tmpPtr->stackWords[-1]) {
+	    DeleteExecStack(tmpPtr);
+	} else {
+	    break;
 	}
-	DeleteExecStack(esPtr);
     }
+    if (esPtr->prevPtr) {
+	eePtr->execStackPtr = esPtr->prevPtr;
+    } else {
+	eePtr->execStackPtr = esPtr;
+    }	
 }
 
 void *