wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1036629 - Take a deathgrip on the runnable passed to NS_DispatchToCurrentThread. r=bsmedberg

Browse Source 
This will prevent a leak of the runnable if it is passed in with a refcount of zero and the dispatch fails.
This commit is contained in:
Andrew McCreight 2014-07-15 14:29:14 -07:00
parent 7baffd6361
commit fae4030844
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xpcom/glue/nsThreadUtils.cpp
View File

@ -139,9 +139,13 @@ NS_IsMainThread()
}
#endif
// It is common to call NS_DispatchToCurrentThread with a newly
// allocated runnable with a refcount of zero. To keep us from leaking
// the runnable if the dispatch method fails, we take a death grip.
NS_METHOD
NS_DispatchToCurrentThread(nsIRunnable* aEvent)
{
nsCOMPtr<nsIRunnable> deathGrip = aEvent;
#ifdef MOZILLA_INTERNAL_API
nsIThread* thread = NS_GetCurrentThread();
if (!thread) {
@ -157,6 +161,11 @@ NS_DispatchToCurrentThread(nsIRunnable* aEvent)
return thread->Dispatch(aEvent, NS_DISPATCH_NORMAL);
}
// In the case of failure with a newly allocated runnable with a
// refcount of zero, we intentionally leak the runnable, because it is
// likely that the runnable is being dispatched to the main thread
// because it owns main thread only objects, so it is not safe to
// release them here.
NS_METHOD
NS_DispatchToMainThread(nsIRunnable* aEvent, uint32_t aDispatchFlags)
{