diff options
| author | kjnash <k.j.nash@usa.net> | 2020-08-11 18:30:03 (GMT) |
|---|---|---|
| committer | kjnash <k.j.nash@usa.net> | 2020-08-11 18:30:03 (GMT) |
| commit | 4b9763f5f70210ad03fefd51d9f7b388309afcae (patch) | |
| tree | 3e464d6e98a0f29922a2caadad0ced85b428414a /generic/tclBasic.c | |
| parent | 0e59966ac59400d43816bc360c74e5b9dfb49493 (diff) | |
| parent | c07c2bb91ccfa02ec939148c02317d2e2978a4c2 (diff) | |
| download | tcl-4b9763f5f70210ad03fefd51d9f7b388309afcae.zip tcl-4b9763f5f70210ad03fefd51d9f7b388309afcae.tar.gz tcl-4b9763f5f70210ad03fefd51d9f7b388309afcae.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tclBasic.c')
| -rw-r--r-- | generic/tclBasic.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index fe64f18..2ac6fef 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -3268,6 +3268,7 @@ Tcl_DeleteCommandFromToken( * TclNRExecuteByteCode looks up the command in the command hashtable). */ + cmdPtr->flags |= CMD_DEAD; TclCleanupCommandMacro(cmdPtr); return 0; } @@ -4138,7 +4139,7 @@ Tcl_CancelEval( if (resultObjPtr != NULL) { result = Tcl_GetStringFromObj(resultObjPtr, &cancelInfo->length); cancelInfo->result = ckrealloc(cancelInfo->result,cancelInfo->length); - memcpy(cancelInfo->result, result, (size_t) cancelInfo->length); + memcpy(cancelInfo->result, result, cancelInfo->length); TclDecrRefCount(resultObjPtr); /* Discard their result object. */ } else { cancelInfo->result = NULL; @@ -4331,7 +4332,7 @@ EvalObjvCore( * Caller gave it to us. */ - if (!(preCmdPtr->flags & CMD_IS_DELETED)) { + if (!(preCmdPtr->flags & CMD_DEAD)) { /* * So long as it exists, use it. */ |