Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-27 07:34:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out c50503ce8669 (bug 883495) for still leaking

Browse Source 
CLOSED TREE
This commit is contained in:
Phil Ringnalda 2013-06-19 20:20:52 -07:00
parent 841ce34498
commit 5b70eb297b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netwerk/dns/nsDNSService2.cpp
View File

@ -255,11 +255,7 @@ public:
uint16_t af)
: mResolver(res)
, mHost(host)
// Sometimes aListener is a main-thread only object like XPCWrappedJS, and
// sometimes it's a threadsafe object like nsSocketTransport. Use a main-
// thread pointer holder, but disable strict enforcement of thread invariants.
// The AddRef implementation of XPCWrappedJS will assert if we go wrong here.
, mListener(new nsMainThreadPtrHolder<nsIDNSListener>(listener, false))
, mListener(listener)
, mFlags(flags)
, mAF(af) {}
~nsDNSAsyncRequest() {}
@ -272,7 +268,7 @@ public:
nsRefPtr<nsHostResolver> mResolver;
nsCString mHost; // hostname we're resolving
nsMainThreadPtrHandle<nsIDNSListener> mListener;
nsCOMPtr<nsIDNSListener> mListener;
uint16_t mFlags;
uint16_t mAF;
};
@ -296,6 +292,7 @@ nsDNSAsyncRequest::OnLookupComplete(nsHostResolver *resolver,
MOZ_EVENT_TRACER_DONE(this, "net::dns::lookup");
mListener->OnLookupComplete(this, rec, status);
mListener = nullptr;
// release the reference to ourselves that was added before we were
// handed off to the host resolver.