From 1f72d24052d8a9b41692c24652f12101c6803c6d Mon Sep 17 00:00:00 2001
From: "locka%iol.ie" <locka%iol.ie@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 12 May 2003 12:13:21 +0000
Subject: [PATCH] Return error codes from NS_InitXPCOM2 & NS_ShutdownXPCOM in
 the event of failure. b=195555 r=sfraser sr=dougt a=sspitzer

git-svn-id: svn://10.0.0.236/trunk@142320 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/embedding/base/nsEmbedAPI.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mozilla/embedding/base/nsEmbedAPI.cpp b/mozilla/embedding/base/nsEmbedAPI.cpp
index 47f5d0bf983..35a8231b2d4 100644
--- a/mozilla/embedding/base/nsEmbedAPI.cpp
+++ b/mozilla/embedding/base/nsEmbedAPI.cpp
@@ -84,7 +84,8 @@ nsresult NS_InitEmbedding(nsILocalFile *mozBinDirectory,
 #endif
     {
         // Initialise XPCOM
-        NS_InitXPCOM2(&sServiceManager, mozBinDirectory, appFileLocProvider);
+        rv = NS_InitXPCOM2(&sServiceManager, mozBinDirectory, appFileLocProvider);
+        NS_ENSURE_SUCCESS(rv, rv);
                 
 #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM
         sXPCOMInitializedFlag = PR_TRUE;
@@ -169,7 +170,8 @@ nsresult NS_TermEmbedding()
 
     // Terminate XPCOM & cleanup
 #ifndef HACK_AROUND_NONREENTRANT_INITXPCOM
-    NS_ShutdownXPCOM(sServiceManager);
+    nsresult rv = NS_ShutdownXPCOM(sServiceManager);
+    NS_ENSURE_SUCCESS(rv, rv);
 #endif
 
     return NS_OK;