Fixing crash in SafeBrowsingDatabaseBloom:...

chrome/browser/safe_browsing/safe_browsing_database_bloom.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/safe_browsing/safe_browsing_database_bloom.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 123 matching lines @@
       return false;
   }
 
   return true;
 }
 
 bool SafeBrowsingDatabaseBloom::Close() {
   if (!db_)
     return true;
 
+  insert_transaction_.reset();
   statement_cache_.reset();  // Must free statements before closing DB.
   bool result = sqlite3_close(db_) == SQLITE_OK;
   db_ = NULL;
 
   return result;
 }
 
 bool SafeBrowsingDatabaseBloom::CreateTables() {
   SQLTransaction transaction(db_);
   transaction.Begin();
@@ skipping 76 matching lines @@
   return true;
 }
 
 // The SafeBrowsing service assumes this operation is run synchronously on the
 // database thread. Any URLs that the service needs to check when this is
 // running are queued up and run once the reset is done.
 bool SafeBrowsingDatabaseBloom::ResetDatabase() {
   hash_cache_->clear();
   ClearUpdateCaches();
 
-  insert_transaction_.reset();
-
   bool rv = Close();
   DCHECK(rv);
 
   if (!file_util::Delete(filename_, false)) {
     NOTREACHED();
     return false;
   }
 
   bloom_filter_ =
       new BloomFilter(kBloomFilterMinSize * kBloomFilterSizeRatio);
@@ skipping 161 matching lines @@
 
 bool SafeBrowsingDatabaseBloom::UpdateStarted() {
   DCHECK(insert_transaction_.get() == NULL);
 
   if (!Open())
     return false;
 
   insert_transaction_.reset(new SQLTransaction(db_));
   if (insert_transaction_->Begin() != SQLITE_OK) {
     DCHECK(false) << "Safe browsing database couldn't start transaction";
-    insert_transaction_.reset();
     Close();
     return false;
   }
   return true;
 }
 
 void SafeBrowsingDatabaseBloom::UpdateFinished(bool update_succeeded) {
   if (update_succeeded)
     BuildBloomFilter();
 
-  insert_transaction_.reset();
   Close();
 
   // We won't need the chunk caches until the next update (which will read them
   // from the database), so free their memory as they may contain thousands of
   // entries.
   ClearUpdateCaches();
 }
 
 void SafeBrowsingDatabaseBloom::InsertAdd(SBPrefix host, SBEntry* entry) {
   STATS_COUNTER("SB.HostInsert", 1);
@@ skipping 1044 matching lines @@
   if (did_resume_) {
     PlatformThread::Sleep(kOnResumeHoldupMs);
     did_resume_ = false;
   }
 }
 
 // This database is always synchronous since we don't need to worry about
 // blocking any incoming reads.
 void SafeBrowsingDatabaseBloom::SetSynchronous() {
 }