Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash in wxCFEventLoop::AddSourceForFD().

Browse Source 
Don't reset CFFileDescriptorRef before passing it to
CFFileDescriptorCreateRunLoopSource(), this resulted in a crash inside this
function.

Closes #11542.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-11-09 23:53:28 +00:00
parent 11ea2e3a84
commit bbacbe3980
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osx/core/evtloop_cf.cpp
View File

@@ -107,8 +107,6 @@ wxCFEventLoop::AddSourceForFD(int fd,
if ( !cffd ) if ( !cffd )
return NULL; return NULL;
source->SetFileDescriptor(cffd.release());
wxCFRef<CFRunLoopSourceRef> wxCFRef<CFRunLoopSourceRef>
cfsrc(CFFileDescriptorCreateRunLoopSource(kCFAllocatorDefault, cffd, 0)); cfsrc(CFFileDescriptorCreateRunLoopSource(kCFAllocatorDefault, cffd, 0));
if ( !cfsrc ) if ( !cfsrc )
@@ -117,6 +115,8 @@ wxCFEventLoop::AddSourceForFD(int fd,
CFRunLoopRef cfloop = CFGetCurrentRunLoop(); CFRunLoopRef cfloop = CFGetCurrentRunLoop();
CFRunLoopAddSource(cfloop, cfsrc, kCFRunLoopDefaultMode); CFRunLoopAddSource(cfloop, cfsrc, kCFRunLoopDefaultMode);
source->SetFileDescriptor(cffd.release());
return source.release(); return source.release();
} }