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 624870: Free nsFactoryEntrys on XPCOM shutdown and factory unregistration. r=bsmedberg

Browse Source
This commit is contained in:
Kyle Huey 2011-04-13 19:41:34 -07:00
parent f62b8eba64
commit 1fabe6561c
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xpcom/components/nsComponentManager.cpp
View File

@ -1324,6 +1324,7 @@ FreeFactoryEntries(const nsID& aCID,
{
aEntry->mFactory = NULL;
aEntry->mServiceObject = NULL;
delete aEntry;
return PL_DHASH_NEXT;
}
@ -1797,6 +1798,7 @@ nsComponentManagerImpl::UnregisterFactory(const nsCID& aClass,
// nsFactoryEntry::GetFactory)
f->mFactory.swap(dyingFactory);
f->mServiceObject.swap(dyingServiceObject);
delete f;
}
return NS_OK;
@ -1941,6 +1943,7 @@ nsFactoryEntry::nsFactoryEntry(const mozilla::Module::CIDEntry* entry,
: mCIDEntry(entry)
, mModule(module)
{
MOZ_COUNT_CTOR(nsFactoryEntry);
}
nsFactoryEntry::nsFactoryEntry(const nsCID& aCID, nsIFactory* factory)
@ -1948,6 +1951,7 @@ nsFactoryEntry::nsFactoryEntry(const nsCID& aCID, nsIFactory* factory)
, mModule(NULL)
, mFactory(factory)
{
MOZ_COUNT_CTOR(nsFactoryEntry);
mozilla::Module::CIDEntry* e = new mozilla::Module::CIDEntry();
nsCID* cid = new nsCID;
*cid = aCID;
@ -1962,6 +1966,7 @@ nsFactoryEntry::~nsFactoryEntry()
delete mCIDEntry->cid;
delete mCIDEntry;
}
MOZ_COUNT_DTOR(nsFactoryEntry);
}
already_AddRefed<nsIFactory>