1 files changed, 41 insertions, 5 deletions

diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index a575f04..7d6b667 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.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: tclTrace.c,v 1.37 2007/05/07 19:45:33 dgp Exp $
+ * RCS: @(#) $Id: tclTrace.c,v 1.38 2007/06/09 20:12:55 msofer Exp $
  */
 
 #include "tclInt.h"
@@ -1396,7 +1396,8 @@ int
 TclCheckExecutionTraces(
     Tcl_Interp *interp,		/* The current interpreter. */
     CONST char *command,	/* Pointer to beginning of the current command
-				 * string. */
+				 * string. If NULL, the string will be
+				 * generated from (objc,objv) */
     int numChars,		/* The number of characters in 'command' which
 				 * are part of the command string. */
     Command *cmdPtr,		/* Points to command's Command struct. */
@@ -1412,11 +1413,24 @@ TclCheckExecutionTraces(
     int traceCode = TCL_OK;
     TraceCommandInfo* tcmdPtr;
     Tcl_InterpState state = NULL;
+    Tcl_Obj *commandPtr = NULL;
 
-    if (command == NULL || cmdPtr->tracePtr == NULL) {
+    if (cmdPtr->tracePtr == NULL) {
 	return traceCode;
     }
 
+    /*
+     * Insure that we have a nul-terminated command string
+     */
+    
+    if (!command) {
+	commandPtr = Tcl_NewListObj(objc, objv);
+	command = Tcl_GetStringFromObj(commandPtr, &numChars);
+    } else if ((numChars != -1) && (command[numChars] != '\0')) {
+	commandPtr = Tcl_NewStringObj(command, numChars);
+	command = TclGetString(commandPtr);
+    }
+    
     curLevel = iPtr->varFramePtr->level;
 
     active.nextPtr = iPtr->activeCmdTracePtr;
@@ -1467,6 +1481,10 @@ TclCheckExecutionTraces(
     if (state) {
 	(void) Tcl_RestoreInterpState(interp, state);
     }
+
+    if (commandPtr) {
+	Tcl_DecrRefCount(commandPtr);
+    }
     return(traceCode);
 }
 
@@ -1497,7 +1515,8 @@ int
 TclCheckInterpTraces(
     Tcl_Interp *interp,		/* The current interpreter. */
     CONST char *command,	/* Pointer to beginning of the current command
-				 * string. */
+				 * string. If NULL, the string will be
+				 * generated from (objc,objv) */
     int numChars,		/* The number of characters in 'command' which
 				 * are part of the command string. */
     Command *cmdPtr,		/* Points to command's Command struct. */
@@ -1512,12 +1531,25 @@ TclCheckInterpTraces(
     int curLevel;
     int traceCode = TCL_OK;
     Tcl_InterpState state = NULL;
+    Tcl_Obj *commandPtr = NULL;
 
-    if (command == NULL || iPtr->tracePtr == NULL
+    if ((iPtr->tracePtr == NULL)
 	    || (iPtr->flags & INTERP_TRACE_IN_PROGRESS)) {
 	return(traceCode);
     }
 
+    /*
+     * Insure that we have a nul-terminated command string
+     */
+    
+    if (!command) {
+	commandPtr = Tcl_NewListObj(objc, objv);
+	command = Tcl_GetStringFromObj(commandPtr, &numChars);
+    } else if ((numChars != -1) && (command[numChars] != '\0')) {
+	commandPtr = Tcl_NewStringObj(command, numChars);
+	command = TclGetString(commandPtr);
+    }
+    
     curLevel = iPtr->numLevels;
 
     active.nextPtr = iPtr->activeInterpTracePtr;
@@ -1615,6 +1647,10 @@ TclCheckInterpTraces(
 	    Tcl_DiscardInterpState(state);
 	}
     }
+
+    if (commandPtr) {
+	Tcl_DecrRefCount(commandPtr);
+    }
     return(traceCode);
 }