From ef63e68ef41d185c2394cf6acf58a0fd7878f11a Mon Sep 17 00:00:00 2001
From: "dbaron%dbaron.org"
 <dbaron%dbaron.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 10 Mar 2006 18:35:57 +0000
Subject: [PATCH] Handle failure case in a way that doesn't crash.  b=328113 
 r+sr+a=bryner

git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@192156 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../toolkit/components/downloads/src/nsDownloadManager.cpp   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp b/mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp
index 5c2028be952..68150c6e3c5 100644
--- a/mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp
+++ b/mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp
@@ -218,7 +218,10 @@ nsDownloadManager::Init()
     return NS_ERROR_OUT_OF_MEMORY;
 
   rv = NS_STATIC_CAST(nsDownloadsDataSource*, (nsIRDFDataSource*)mDataSource.get())->LoadDataSource();
-  if (NS_FAILED(rv)) return rv;
+  if (NS_FAILED(rv)) {
+    mDataSource = nsnull; // so we don't UnregisterDataSource on it
+    return rv;
+  }
 
   nsCOMPtr<nsIStringBundleService> bundleService = do_GetService(kStringBundleServiceCID, &rv);
   if (NS_FAILED(rv)) return rv;