From c9ea0f44cf8cf28cf6f7970ef86ee9d39425ae20 Mon Sep 17 00:00:00 2001
From: "dp%netscape.com" <dp%netscape.com>
Date: Fri, 31 Aug 2001 17:45:51 +0000
Subject: [PATCH] bug# 97770 fixing tree orange due to crash on unload

---
 xpcom/components/nsComponentManager.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/xpcom/components/nsComponentManager.cpp b/xpcom/components/nsComponentManager.cpp
index df555a0e3d8..f6085609542 100644
--- a/xpcom/components/nsComponentManager.cpp
+++ b/xpcom/components/nsComponentManager.cpp
@@ -1954,9 +1954,11 @@ nsComponentManagerImpl::UnloadLibraries(nsIServiceManager *serviceMgr, PRInt32 a
     /* iterate over all known loaders and ask them to autoregister. */
     // Skip mNativeComponentLoader
     for (int i=NS_COMPONENT_TYPE_NATIVE + 1; i<mNLoaderData; i++) {
-        rv = mLoaderData[i].loader->UnloadAll(aWhen);
-        if (NS_FAILED(rv))
-            break;
+        if (mLoaderData[i].loader) {
+            rv = mLoaderData[i].loader->UnloadAll(aWhen);
+            if (NS_FAILED(rv))
+                break;
+        }
     }
 
     // UnloadAll the native loader