Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-16 22:04:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adding consistency checks on ReleaseService.

Browse Source
This commit is contained in:
dp%netscape.com 1999-08-04 09:36:12 +00:00
parent 231490f805
commit 7e2f23ac4e
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xpcom/components/nsServiceManager.cpp
View File

@ -274,6 +274,7 @@ NS_IMETHODIMP
nsServiceManagerImpl::ReleaseService(const nsCID& aClass, nsISupports* service,
nsIShutdownListener* shutdownListener)
{
PRBool serviceFound = PR_FALSE;
nsresult rv = NS_OK;
PR_CEnterMonitor(this);
@ -281,25 +282,30 @@ nsServiceManagerImpl::ReleaseService(const nsCID& aClass, nsISupports* service,
// Do entry lookup only if there is a shutdownlistener to be removed.
//
// For Debug builds, Consistency check for entry always. Releasing service
// when the service is not with the servicemanager is mostly wrong.
// when the service is not with the servicemanager is mostly wrong.
if (shutdownListener)
#endif
{
nsIDKey key(aClass);
nsServiceEntry* entry = (nsServiceEntry*)mServices->Get(&key);
// During shutdown, it is possible for the service to have been
// already removed.
if (mShuttingDown = PR_FALSE)
NS_ASSERTION(entry, "service not found");
if (entry) {
rv = entry->RemoveListener(shutdownListener);
serviceFound == PR_TRUE;
}
}
NS_RELEASE(service);
nsrefcnt cnt;
NS_RELEASE2(service, cnt);
// Consistency check: Service ref count cannot go to zero because of the
// extra addref the service manager does, unless the service has been
// unregistered (ie) not found in the service managers hash table.
//
NS_ASSERTION(cnt > 0 || !serviceFound,
"*** Service in hash table but is being deleted. Dangling pointer\n"
"*** in service manager hash table.");
PR_CExitMonitor(this);
return rv;
}