diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 22:11:54 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 22:11:54 +0000 |
| commit | c35a2e94a749acdf7079d7202b98eb863f7e9e96 (patch) | |
| tree | 87f20aabe27365b348af3535e889f16278b0a9b6 | |
| parent | 8ca9cd1f8d7590884dcc1937d8cca152407ef82f (diff) | |
| download | chromium_src-c35a2e94a749acdf7079d7202b98eb863f7e9e96.zip chromium_src-c35a2e94a749acdf7079d7202b98eb863f7e9e96.tar.gz chromium_src-c35a2e94a749acdf7079d7202b98eb863f7e9e96.tar.bz2 | |
Fix a crash in FormStructure when parsing a form with zero fields. Use field_count() instead of directly accessing the size of |fields_| because we NULL-terminate the field vector.
BUG=none
TEST=fox.com/24 doesn't crash the browser.
Review URL: http://codereview.chromium.org/657010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39778 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/autofill/form_structure.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/autofill/form_structure.cc b/chrome/browser/autofill/form_structure.cc index f1e8025..705c6a1 100644 --- a/chrome/browser/autofill/form_structure.cc +++ b/chrome/browser/autofill/form_structure.cc @@ -165,7 +165,7 @@ std::string FormStructure::FormSignature() const { } bool FormStructure::IsAutoFillable() const { - if (fields_.size() == 0) + if (field_count() == 0) return false; // Rule out http(s)://*/search?... @@ -175,7 +175,7 @@ bool FormStructure::IsAutoFillable() const { return false; // Disqualify all forms that are likely to be search boxes (like google.com). - if (fields_.size() == 1) { + if (field_count() == 1) { std::string name = UTF16ToUTF8(fields_[0]->name()); if (name == "q") return false; @@ -188,7 +188,7 @@ bool FormStructure::IsAutoFillable() const { } void FormStructure::set_possible_types(int index, const FieldTypeSet& types) { - int num_fields = static_cast<int>(fields_.size()); + int num_fields = static_cast<int>(field_count()); DCHECK(index >= 0 && index < num_fields); if (index >= 0 && index < num_fields) fields_[index]->set_possible_types(types); @@ -200,7 +200,8 @@ const AutoFillField* FormStructure::field(int index) const { size_t FormStructure::field_count() const { // Don't count the NULL terminator. - return fields_.size() - 1; + size_t field_size = fields_.size(); + return (field_size == 0) ? 0 : field_size - 1; } bool FormStructure::operator!=(const FormData& form) const { |