Bug 327350 initialization of places services can fail in error conditions (r=sspitzer)

toolkit/components/places/src/nsNavHistory.cpp

@@ -124,6 +124,9 @@
 #define HISTORY_URI_LENGTH_MAX 65536
 #define HISTORY_TITLE_LENGTH_MAX 4096
 
+// db file name
+#define DB_FILENAME NS_LITERAL_STRING("places.sqlite")
+
 // Lazy adding
 
 #ifdef LAZY_ADD
@@ -398,18 +401,54 @@ nsNavHistory::InitDB(PRBool *aDoImport)
   *aDoImport = PR_FALSE;
 
   // init DB
+  nsCOMPtr<nsIFile> profDir;
   nsCOMPtr<nsIFile> dbFile;
   rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
-                              getter_AddRefs(dbFile));
+                              getter_AddRefs(profDir));
   NS_ENSURE_SUCCESS(rv, rv);
-  rv = dbFile->Append(NS_LITERAL_STRING("places.sqlite"));
+  rv = profDir->Clone(getter_AddRefs(dbFile));
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = dbFile->Append(DB_FILENAME);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // if the places file doesn't exist, set the do-import-bookmarks flag
-  PRBool exists;
-  rv = dbFile->Exists(&exists);
+  // import bookmarks if places.sqlite doesn't exist
+  PRBool dbExists;
+  rv = dbFile->Exists(&dbExists);
   NS_ENSURE_SUCCESS(rv, rv);
-  if (!exists) {
+
+  // open the database
+  mDBService = do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID, &rv);
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = mDBService->OpenDatabase(dbFile, getter_AddRefs(mDBConn));
+  if (rv == NS_ERROR_FILE_CORRUPTED) {
+    dbExists = PR_FALSE;
+    // backup the corrupted db file
+    nsAutoString corruptFileName;
+    rv = dbFile->GetLeafName(corruptFileName);
+    NS_ENSURE_SUCCESS(rv, rv);
+    corruptFileName.Append(NS_LITERAL_STRING(".corrupt"));
+
+    nsCOMPtr<nsIFile> corruptBackup;
+    rv = profDir->Clone(getter_AddRefs(corruptBackup));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = corruptBackup->Append(corruptFileName);
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = corruptBackup->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600);
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = dbFile->MoveTo(nsnull, corruptFileName);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = profDir->Clone(getter_AddRefs(dbFile));
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = dbFile->Append(DB_FILENAME);
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = mDBService->OpenDatabase(dbFile, getter_AddRefs(mDBConn));
+  }
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // if the db didn't previously exist, or was corrupted, re-import bookmarks.
+  if (!dbExists) {
     nsCOMPtr<nsIPrefBranch> prefs(do_GetService("@mozilla.org/preferences-service;1"));
     if (prefs) {
       rv = prefs->SetBoolPref(PREF_BROWSER_IMPORT_BOOKMARKS, PR_TRUE);
@@ -417,17 +456,6 @@ nsNavHistory::InitDB(PRBool *aDoImport)
     }
   }
 
-  mDBService = do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = mDBService->OpenDatabase(dbFile, getter_AddRefs(mDBConn));
-  if (rv == NS_ERROR_FILE_CORRUPTED) {
-    // delete the db and try opening again
-    rv = dbFile->Remove(PR_FALSE);
-    NS_ENSURE_SUCCESS(rv, rv);
-    rv = mDBService->OpenDatabase(dbFile, getter_AddRefs(mDBConn));
-  }
-  NS_ENSURE_SUCCESS(rv, rv);
-
   // Set the database page size. This will only have any effect on empty files,
   // so must be done before anything else. If the file already exists, we'll
   // get that file's page size and this will have no effect.