Importer - Add defensive check for data from IPC

chrome/browser/importer/external_process_importer_client.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 "chrome/browser/importer/external_process_importer_client.h"
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/importer/external_process_importer_host.h"
@@ skipping 156 matching lines @@
 }
 
 void ExternalProcessImporterClient::OnHistoryImportGroup(
     const std::vector<ImporterURLRow>& history_rows_group,
     int visit_source) {
   if (cancelled_)
     return;
 
   history_rows_.insert(history_rows_.end(), history_rows_group.begin(),
                        history_rows_group.end());
-  if (history_rows_.size() == total_history_rows_count_)
+  if (history_rows_.size() >= total_history_rows_count_)
     bridge_->SetHistoryItems(history_rows_,
                              static_cast<importer::VisitSource>(visit_source));
 }
 
 void ExternalProcessImporterClient::OnHomePageImportReady(
     const GURL& home_page) {
   if (cancelled_)
     return;
 
   bridge_->AddHomePage(home_page);
@@ skipping 12 matching lines @@
 
 void ExternalProcessImporterClient::OnBookmarksImportGroup(
     const std::vector<ImportedBookmarkEntry>& bookmarks_group) {
   if (cancelled_)
     return;
 
   // Collect sets of bookmarks from importer process until we have reached
   // total_bookmarks_count_:
   bookmarks_.insert(bookmarks_.end(), bookmarks_group.begin(),
                     bookmarks_group.end());
-  if (bookmarks_.size() == total_bookmarks_count_)
+  if (bookmarks_.size() >= total_bookmarks_count_)
     bridge_->AddBookmarks(bookmarks_, bookmarks_first_folder_name_);
 }
 
 void ExternalProcessImporterClient::OnFaviconsImportStart(
     size_t total_favicons_count) {
   if (cancelled_)
     return;
 
   total_favicons_count_ = total_favicons_count;
   favicons_.reserve(total_favicons_count);
 }
 
 void ExternalProcessImporterClient::OnFaviconsImportGroup(
     const std::vector<ImportedFaviconUsage>& favicons_group) {
   if (cancelled_)
     return;
 
   favicons_.insert(favicons_.end(), favicons_group.begin(),
                     favicons_group.end());
-  if (favicons_.size() == total_favicons_count_)
+  if (favicons_.size() >= total_favicons_count_)
     bridge_->SetFavicons(favicons_);
 }
 
 void ExternalProcessImporterClient::OnPasswordFormImportReady(
     const autofill::PasswordForm& form) {
   if (cancelled_)
     return;
 
   bridge_->SetPasswordForm(form);
 }
@@ skipping 24 matching lines @@
 
 void ExternalProcessImporterClient::OnAutofillFormDataImportGroup(
     const std::vector<ImporterAutofillFormDataEntry>&
         autofill_form_data_entry_group) {
   if (cancelled_)
     return;
 
   autofill_form_data_.insert(autofill_form_data_.end(),
                              autofill_form_data_entry_group.begin(),
                              autofill_form_data_entry_group.end());
-  if (autofill_form_data_.size() == total_autofill_form_data_entry_count_)
+  if (autofill_form_data_.size() >= total_autofill_form_data_entry_count_)
     bridge_->SetAutofillFormData(autofill_form_data_);
 }
 
 #if defined(OS_WIN)
 void ExternalProcessImporterClient::OnIE7PasswordReceived(
     const importer::ImporterIE7PasswordInfo& importer_password_info) {
   if (cancelled_)
     return;
   bridge_->AddIE7PasswordInfo(importer_password_info);
 }
@@ skipping 57 matching lines @@
   localized_strings.SetString(
       base::IntToString(IDS_IMPORT_FROM_SAFARI),
       l10n_util::GetStringUTF8(IDS_IMPORT_FROM_SAFARI));
   localized_strings.SetString(
       base::IntToString(IDS_BOOKMARK_BAR_FOLDER_NAME),
       l10n_util::GetStringUTF8(IDS_BOOKMARK_BAR_FOLDER_NAME));
 
   utility_process_host_->Send(new ProfileImportProcessMsg_StartImport(
       source_profile_, items_, localized_strings));
 }