From d8ad4b7c5b396f77b4148d39b50218f0a1d75168 Mon Sep 17 00:00:00 2001 From: das Date: Thu, 19 May 2005 13:27:27 +0000 Subject: * 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. --- ChangeLog | 7 +++++++ macosx/tclMacOSXNotify.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45fd42b..83b9368 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-05-19 Daniel Steffen + + * 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 * 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; -- cgit v0.12