diff --git a/mozilla/xpcom/components/nsNativeComponentLoader.cpp b/mozilla/xpcom/components/nsNativeComponentLoader.cpp index 595505f3f43..41575ecea9b 100644 --- a/mozilla/xpcom/components/nsNativeComponentLoader.cpp +++ b/mozilla/xpcom/components/nsNativeComponentLoader.cpp @@ -182,7 +182,7 @@ nsNativeComponentLoader::Init(nsIComponentManager *aCompMgr, nsISupports *aReg) mCompMgr = aCompMgr; mRegistry = do_QueryInterface(aReg); - if (!mCompMgr.get() || !mRegistry) + if (!mCompMgr || !mRegistry) return NS_ERROR_INVALID_ARG; rv = mRegistry->GetSubtree(nsIRegistry::Common, xpcomKeyName, diff --git a/mozilla/xpcom/components/nsNativeComponentLoader.h b/mozilla/xpcom/components/nsNativeComponentLoader.h index 7a6aa9aa5c8..e1a2f905829 100644 --- a/mozilla/xpcom/components/nsNativeComponentLoader.h +++ b/mozilla/xpcom/components/nsNativeComponentLoader.h @@ -45,7 +45,7 @@ class nsNativeComponentLoader : public nsIComponentLoader { protected: nsCOMPtr mRegistry; - nsCOMPtr mCompMgr; + nsIComponentManager* mCompMgr; // weak reference -- backpointer nsObjectHashtable* mDllStore; NS_IMETHOD RegisterComponentsInDir(PRInt32 when, nsIFileSpec *dir); nsIRegistry::Key mXPCOMKey;