SyncFS: Deleting iterator before closing database.

chrome/browser/sync_file_system/local/local_file_change_tracker.cc

 // Copyright 2013 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/sync_file_system/local/local_file_change_tracker.h"
 
 #include <stddef.h>
 #include <queue>
 #include <utility>
 
@@ skipping 581 matching lines @@
   }
 
   scoped_ptr<leveldb::Iterator> iter(db_->NewIterator(leveldb::ReadOptions()));
   iter->SeekToFirst();
   FileSystemURL url;
   while (iter->Valid()) {
     if (!DeserializeSyncableFileSystemURL(iter->key().ToString(), &url)) {
       LOG(WARNING) << "Failed to deserialize an URL. "
                    << "TrackerDB might be corrupted.";
       db_status_ = SYNC_DATABASE_ERROR_CORRUPTION;
+      iter.reset();  // Must delete before closing the database.
       db_.reset();
       return db_status_;
     }
     dirty_files->push(url);
     iter->Next();
   }
   return SYNC_STATUS_OK;
 }
 
 SyncStatusCode LocalFileChangeTracker::TrackerDB::WriteBatch(
     scoped_ptr<leveldb::WriteBatch> batch) {
   if (db_status_ != SYNC_STATUS_OK)
     return db_status_;
 
   leveldb::Status status = db_->Write(leveldb::WriteOptions(), batch.get());
   if (!status.ok() && !status.IsNotFound()) {
     HandleError(FROM_HERE, status);
     db_status_ = LevelDBStatusToSyncStatusCode(status);
     db_.reset();
     return db_status_;
   }
   return SYNC_STATUS_OK;
 }
 
 }  // namespace sync_file_system