AutoFill: Handle the case where the cached form has extra fields at the end of

the form compared to the FormData.  Fixes a crash.

BUG=41573
TEST=FormManagerTest.FillFormExtraFieldInCache

Review URL: http://codereview.chromium.org/2003002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46600 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 3 deletions

diff --git a/chrome/renderer/form_manager.cc b/chrome/renderer/form_manager.cc
index e39c3b1..f81d6df 100644
--- a/chrome/renderer/form_manager.cc
+++ b/chrome/renderer/form_manager.cc
@@ -414,12 +414,19 @@ bool FormManager::FillForm(const FormData& form) {
     // so loop past non-matching fields in the set with more elements.
     while (form_element->control_elements[i].nameForAutofill() !=
            form.fields[j].name()) {
-      if (form_element->control_elements.size() > form.fields.size())
+      if (form_element->control_elements.size() > form.fields.size()) {
+        // We're at the end of the elements already.
+        if (i + 1 == form_element->control_elements.size())
+          break;
         ++i;
-      else if (form.fields.size() > form_element->control_elements.size())
+      } else if (form.fields.size() > form_element->control_elements.size()) {
+        // We're at the end of the elements already.
+        if (j + 1 == form.fields.size())
+          break;
         ++j;
-      else
+      } else {
         NOTREACHED();
+      }
 
       continue;
     }