AppCache: Run a quick integrity check on the sqlite database when opening.

webkit/browser/appcache/appcache_database.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/browser/appcache/appcache_database.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 1001 matching lines @@
   if (use_in_memory_db) {
     opened = db_->OpenInMemory();
   } else if (!base::CreateDirectory(db_file_path_.DirName())) {
     LOG(ERROR) << "Failed to create appcache directory.";
   } else {
     opened = db_->Open(db_file_path_);
     if (opened)
       db_->Preload();
   }
 
-  if (!opened || !EnsureDatabaseVersion()) {
+  if (!opened || !QuickIntegrityCheck() || !EnsureDatabaseVersion()) {
     LOG(ERROR) << "Failed to open the appcache database.";
     AppCacheHistograms::CountInitResult(
         AppCacheHistograms::SQL_DATABASE_ERROR);
 
     // We're unable to open the database. This is a fatal error
     // which we can't recover from. We try to handle it by deleting
     // the existing appcache data and starting with a clean slate in
     // this browser session.
     if (!use_in_memory_db && DeleteExistingAndCreateNewDatabase())
       return true;
 
     Disable();
     return false;
   }
 
   AppCacheHistograms::CountInitResult(AppCacheHistograms::INIT_OK);
   return true;
 }
 
+bool AppCacheDatabase::QuickIntegrityCheck() {
+  DCHECK(db_.get());
+  std::vector<std::string> messages;
+  if (!db_->QuickIntegrityCheck(&messages))
+    return false;
+  return messages.size() == 1 && messages[0] == "ok";
+}
+
 bool AppCacheDatabase::EnsureDatabaseVersion() {
   if (!sql::MetaTable::DoesTableExist(db_.get()))
     return CreateSchema();
 
   if (!meta_table_->Init(db_.get(), kCurrentVersion, kCompatibleVersion))
     return false;
 
   if (meta_table_->GetCompatibleVersionNumber() > kCurrentVersion) {
     LOG(WARNING) << "AppCache database is too new.";
     return false;
@@ skipping 154 matching lines @@
 
   // So we can't go recursive.
   if (is_recreating_)
     return false;
 
   base::AutoReset<bool> auto_reset(&is_recreating_, true);
   return LazyOpen(true);
 }
 
 }  // namespace appcache