Fix [Bug 3105999]; deallocate temporary structure.

1 files changed, 11 insertions, 4 deletions

diff --git a/generic/tclOOMethod.c b/generic/tclOOMethod.c
index 1255f1d..61aeb12 100644
--- a/generic/tclOOMethod.c
+++ b/generic/tclOOMethod.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclOOMethod.c,v 1.28 2010/09/26 14:16:26 msofer Exp $
+ * RCS: @(#) $Id: tclOOMethod.c,v 1.29 2010/11/09 16:26:30 dkf Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -929,7 +929,7 @@ ProcedureMethodVarResolver(
     Tcl_Var *varPtr)
 {
     int result;
-    Tcl_ResolvedVarInfo *rPtr;
+    Tcl_ResolvedVarInfo *rPtr = NULL;
     
     result = ProcedureMethodCompiledVarResolver(interp, varName,
 	    strlen(varName), contextNs, &rPtr);
@@ -939,6 +939,14 @@ ProcedureMethodVarResolver(
     }
 
     *varPtr = rPtr->fetchProc(interp, rPtr);
+
+    /*
+     * Must not retain reference to resolved information. [Bug 3105999]
+     */
+
+    if (rPtr != NULL) {
+	rPtr->deleteProc(rPtr);
+    }
     return (*varPtr? TCL_OK : TCL_CONTINUE);
 }
 
@@ -956,8 +964,6 @@ ProcedureMethodCompiledVarConnect(
     int i, isNew, cacheIt, varLen, len;
     const char *match, *varName;
 
-    varName = TclGetStringFromObj(infoPtr->variableObj, &varLen);
-
     /*
      * Check that the variable is being requested in a context that is also a
      * method call; if not (i.e. we're evaluating in the object's namespace or
@@ -984,6 +990,7 @@ ProcedureMethodCompiledVarConnect(
      * either.
      */
 
+    varName = TclGetStringFromObj(infoPtr->variableObj, &varLen);
     if (contextPtr->callPtr->chain[contextPtr->index]
 	    .mPtr->declaringClassPtr != NULL) {
 	FOREACH(variableObj, contextPtr->callPtr->chain[contextPtr->index]