freed global service manager in NS_ShutdownXPCOM

webshell/tests/viewer/nsWinMain.cpp

@@ -138,7 +138,6 @@ int main(int argc, char **argv)
   NS_RELEASE(app);
   rv = NS_ShutdownXPCOM(servMgr);
   NS_ASSERTION(NS_SUCCEEDED(rv), "NS_ShutdownXPCOM failed");
-  NS_RELEASE(servMgr);
   return result;
 }
 

xpcom/build/nsXPComInit.cpp

@@ -435,6 +435,11 @@ nsresult NS_COM NS_InitXPCOM(nsIServiceManager* *result,
 nsresult NS_COM NS_ShutdownXPCOM(nsIServiceManager* servMgr)
 {
     NS_RELEASE(nsServiceManager::mGlobalServiceManager);
+    // We may have AddRef'd for the caller of NS_InitXPCOM, so release it 
+    // here again:
+    NS_IF_RELEASE(servMgr);
+    // Finally, release the component manager last because it unloads the
+    // libraries:
     NS_RELEASE(nsComponentManagerImpl::gComponentManager);
 #ifdef DEBUG
     extern void _FreeAutoLockStatics();