Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 09:45:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1414549: Correctly handle GetDeliveryTarget failure. r=mixedpuppy

Browse Source 
getter_AddRefs nulls its parameter before passing it to the getter function,
which means that on failure, we wind up with a null IO thread, rather than its
original main thread value.

MozReview-Commit-ID: 1SSIeNtiBq9

--HG--
extra : rebase_source : 05e4437e86ab4036e93e2577f46ff0cfd0a3d329
This commit is contained in:
Kris Maglione 2017-11-05 19:22:38 -08:00
parent 3699fb8ded
commit e32e9e2376
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
toolkit/components/extensions/webrequest/StreamFilterParent.cpp
View File

@ -418,8 +418,11 @@ StreamFilterParent::OnStartRequest(nsIRequest* aRequest, nsISupports* aContext)
// Important: Do this only *after* running the next listener in the chain, so
// that we get the final delivery target after any retargeting that it may do.
if (nsCOMPtr<nsIThreadRetargetableRequest> req = do_QueryInterface(aRequest)) {
Unused << req->GetDeliveryTarget(getter_AddRefs(mIOThread));
MOZ_ASSERT(mIOThread);
nsCOMPtr<nsIEventTarget> thread;
Unused << req->GetDeliveryTarget(getter_AddRefs(thread));
if (thread) {
mIOThread = Move(thread);
}
}
return rv;