diff options
| author | Joe Mistachkin <joe@mistachkin.com> | 2011-11-18 01:01:37 (GMT) |
|---|---|---|
| committer | Joe Mistachkin <joe@mistachkin.com> | 2011-11-18 01:01:37 (GMT) |
| commit | cbbafb5b24789f4dea920b73a76d01426e628081 (patch) | |
| tree | c9ab5d5351739a71a886d39ff57055f3d327b00d | |
| parent | 12cf9081bc10c72509ef43f741b02dc3626019d5 (diff) | |
| download | tcl-cbbafb5b24789f4dea920b73a76d01426e628081.zip tcl-cbbafb5b24789f4dea920b73a76d01426e628081.tar.gz tcl-cbbafb5b24789f4dea920b73a76d01426e628081.tar.bz2 | |
For [testthread cancel], avoid creating a new Tcl_Obj when the default script cancellation result is desired.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tclThreadTest.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2011-11-17 Joe Mistachkin <joe@mistachkin.com> + + * 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 <dkf@users.sf.net> * 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); } /* |