diff options
| author | das <das> | 2005-05-19 13:27:27 (GMT) |
|---|---|---|
| committer | das <das> | 2005-05-19 13:27:27 (GMT) |
| commit | 1767d58b5bf635aa0e4beafb9576c9827675cde1 (patch) | |
| tree | 652eee1d964ae9e411018b717164481bc6041437 | |
| parent | e9297b822ba5dc56ecc0c66be9baab5f64e690c8 (diff) | |
| download | tcl-1767d58b5bf635aa0e4beafb9576c9827675cde1.zip tcl-1767d58b5bf635aa0e4beafb9576c9827675cde1.tar.gz tcl-1767d58b5bf635aa0e4beafb9576c9827675cde1.tar.bz2 | |
* macosx/tclMacOSXNotify.c (Tcl_InitNotifier): fixed crashing
CFRelease of runLoopSource in Tcl_InitNotifier (reported by Zoran):
CFRunLoopAddSource doesn't CFRetain, so can only CFRelease the
runLoopSource in Tcl_FinalizeNotifier.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | macosx/tclMacOSXNotify.c | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2005-05-19 Daniel Steffen <das@users.sourceforge.net> + + * macosx/tclMacOSXNotify.c (Tcl_InitNotifier): fixed incorrect + CFRelease of runLoopSource in Tcl_InitNotifier (reported by Zoran). + CFRunLoopAddSource doesn't CFRetain, so moved the CFRelease to + Tcl_FinalizeNotifier. + 2005-05-18 Don Porter <dgp@users.sourceforge.net> * generic/tclBasic.c (Tcl_ExprBoolean): Rewrite as wrapper around diff --git a/macosx/tclMacOSXNotify.c b/macosx/tclMacOSXNotify.c index 9de3c98..e091888 100644 --- a/macosx/tclMacOSXNotify.c +++ b/macosx/tclMacOSXNotify.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclMacOSXNotify.c,v 1.1 2005/05/14 20:46:46 das Exp $ + * RCS: @(#) $Id: tclMacOSXNotify.c,v 1.2 2005/05/19 13:27:28 das Exp $ */ #ifdef HAVE_COREFOUNDATION /* Traditional unix select-based notifier @@ -248,7 +248,6 @@ Tcl_InitNotifier() Tcl_Panic("Tcl_InitNotifier: could not create CFRunLoopSource."); } CFRunLoopAddSource(runLoop, runLoopSource, kCFRunLoopCommonModes); - CFRelease(runLoopSource); tsdPtr->runLoopSource = runLoopSource; tsdPtr->runLoop = runLoop; } @@ -363,6 +362,7 @@ Tcl_FinalizeNotifier(clientData) tsdPtr->runLoop = NULL; /* Remove runLoopSource from all CFRunLoops and release it */ CFRunLoopSourceInvalidate(tsdPtr->runLoopSource); + CFRelease(runLoopSource); tsdPtr->runLoopSource = NULL; } UNLOCK_NOTIFIER; |
