From c0089bebf222935ebedd937985ee0c73de5767de Mon Sep 17 00:00:00 2001 From: Joe Mistachkin Date: Fri, 18 Nov 2011 01:01:37 +0000 Subject: For [testthread cancel], avoid creating a new Tcl_Obj when the default script cancellation result is desired. --- ChangeLog | 5 +++++ generic/tclThreadTest.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 83e5703..0932130 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-11-17 Joe Mistachkin + + * generic/tclThreadTest.c: For [testthread cancel], avoid creating a + new Tcl_Obj when the default script cancellation result is desired. + 2011-11-11 Donal K. Fellows * win/tclWinConsole.c: Refactor common thread handling patterns. diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c index 3345081..22b5995 100644 --- a/generic/tclThreadTest.c +++ b/generic/tclThreadTest.c @@ -988,7 +988,8 @@ ThreadCancel( Tcl_MutexUnlock(&threadMutex); Tcl_ResetResult(interp); - return Tcl_CancelEval(tsdPtr->interp, Tcl_NewStringObj(result, -1), 0, flags); + return Tcl_CancelEval(tsdPtr->interp, + (result != NULL) ? Tcl_NewStringObj(result, -1) : NULL, 0, flags); } /* -- cgit v0.12