diff options
| author | dgp@users.sourceforge.net <dgp> | 2007-03-12 19:28:49 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2007-03-12 19:28:49 (GMT) |
| commit | daba0b457da2bc8c20eb274da6b674b3a9c784fd (patch) | |
| tree | c0897b0e5e07699929553e8d51d8ade561ae713e /generic/tclEvent.c | |
| parent | aab50a7b704ef4dca19569a7998a4de94d9fd971 (diff) | |
| download | tcl-daba0b457da2bc8c20eb274da6b674b3a9c784fd.zip tcl-daba0b457da2bc8c20eb274da6b674b3a9c784fd.tar.gz tcl-daba0b457da2bc8c20eb274da6b674b3a9c784fd.tar.bz2 | |
* generic/tclEvent.c (HandleBgErrors): Make efficient private copy
* tests/event.test (event-5.3): of the command prefix for the interp's
background error handling command to avoid panics due to pointers
to memory invalid after shimmering. [Bug 1670155]
Diffstat (limited to 'generic/tclEvent.c')
| -rw-r--r-- | generic/tclEvent.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/generic/tclEvent.c b/generic/tclEvent.c index 8c0c34c..2f03444 100644 --- a/generic/tclEvent.c +++ b/generic/tclEvent.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclEvent.c,v 1.69 2006/11/13 08:23:07 das Exp $ + * RCS: @(#) $Id: tclEvent.c,v 1.70 2007/03/12 19:28:49 dgp Exp $ */ #include "tclInt.h" @@ -200,11 +200,16 @@ HandleBgErrors( int code, prefixObjc; Tcl_Obj **prefixObjv, **tempObjv; + /* + * Note we copy the handler command prefix each pass through, so + * we do support one handler setting another handler. + */ + + Tcl_Obj *copyObj = TclListObjCopy(NULL, assocPtr->cmdPrefix); + errPtr = assocPtr->firstBgPtr; - Tcl_IncrRefCount(assocPtr->cmdPrefix); - Tcl_ListObjGetElements(NULL, assocPtr->cmdPrefix, &prefixObjc, - &prefixObjv); + Tcl_ListObjGetElements(NULL, copyObj, &prefixObjc, &prefixObjv); tempObjv = (Tcl_Obj **) ckalloc((prefixObjc+2)*sizeof(Tcl_Obj *)); memcpy(tempObjv, prefixObjv, prefixObjc*sizeof(Tcl_Obj *)); tempObjv[prefixObjc] = errPtr->errorMsg; @@ -216,7 +221,7 @@ HandleBgErrors( * Discard the command and the information about the error report. */ - Tcl_DecrRefCount(assocPtr->cmdPrefix); + Tcl_DecrRefCount(copyObj); Tcl_DecrRefCount(errPtr->errorMsg); Tcl_DecrRefCount(errPtr->returnOpts); assocPtr->firstBgPtr = errPtr->nextPtr; |