Addressing sr comments from darin. Bug 322369.

Original committer: bryner%brianryner.com
Original revision: 1.2
Original date: 2006/01/18 01:21:36

toolkit/components/places/src/nsMorkHistoryImporter.cpp

@@ -195,6 +195,8 @@ NS_IMETHODIMP
 nsMorkHistoryImporter::ImportHistory(nsIFile *aFile,
                                      nsINavHistoryService *aHistory)
 {
+  NS_ENSURE_TRUE(aFile && aHistory, NS_ERROR_NULL_POINTER);
+
   // Read in the mork file
   nsMorkReader reader;
   nsresult rv = reader.Init();
@@ -223,6 +225,7 @@ nsMorkHistoryImporter::ImportHistory(nsIFile *aFile,
   // Now add the results to history
   nsNavHistory *history = NS_STATIC_CAST(nsNavHistory*, aHistory);
   mozIStorageConnection *conn = history->GetStorageConnection();
+  NS_ENSURE_TRUE(conn, NS_ERROR_NOT_INITIALIZED);
   mozStorageTransaction transaction(conn, PR_FALSE);
 
   reader.EnumerateRows(AddToHistoryCB, &data);