From fa311630abcb2439d3c9701efbfc94ad0041d86d Mon Sep 17 00:00:00 2001 From: dgp Date: Wed, 2 Mar 2016 15:29:48 +0000 Subject: [bbc304f61a] Proposed fix for reflected watch race condition. --- generic/tclIORChan.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/generic/tclIORChan.c b/generic/tclIORChan.c index 21c766e..9c79f5f 100644 --- a/generic/tclIORChan.c +++ b/generic/tclIORChan.c @@ -1609,7 +1609,7 @@ ReflectWatch( return; } - rcPtr->interest = mask; +// rcPtr->interest = mask; /* * Are we in the correct thread? @@ -1633,6 +1633,7 @@ ReflectWatch( Tcl_Preserve(rcPtr); + rcPtr->interest = mask; maskObj = DecodeEventMask(mask); /* assert maskObj.refCount == 1 */ (void) InvokeTclMethod(rcPtr, METH_WATCH, maskObj, NULL, NULL); @@ -3083,6 +3084,7 @@ ForwardProc( /* assert maskObj.refCount == 1 */ Tcl_Preserve(rcPtr); + rcPtr->interest = paramPtr->watch.mask; (void) InvokeTclMethod(rcPtr, METH_WATCH, maskObj, NULL, NULL); Tcl_DecrRefCount(maskObj); Tcl_Release(rcPtr); -- cgit v0.12