[Autofill] Autofill incorrectly fills credit card expiration year in 2-digit fields.

components/autofill/core/browser/credit_card_field.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 "components/autofill/core/browser/credit_card_field.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 42 matching lines @@
       if (ParseField(scanner, name_pattern, &credit_card_field->cardholder_))
         continue;
 
       // As a hard-coded hack for Expedia's billing pages (expedia_checkout.html
       // and ExpediaBilling.html in our test suite), recognize separate fields
       // for the cardholder's first and last name if they have the labels "cfnm"
       // and "clnm".
       scanner->SaveCursor();
       const AutofillField* first;
       if (ParseField(scanner, base::ASCIIToUTF16("^cfnm"), &first) &&
-          ParseField(scanner, base::ASCIIToUTF16("^clnm"),
+          ParseField(scanner,
+                     base::ASCIIToUTF16("^clnm"),
                      &credit_card_field->cardholder_last_)) {
         credit_card_field->cardholder_ = first;
         continue;
       }
       scanner->Rewind();
     }
 
     // Check for a credit card type (Visa, MasterCard, etc.) field.
     base::string16 type_pattern = base::UTF8ToUTF16(autofill::kCardTypeRe);
     if (!credit_card_field->type_ &&
-        ParseFieldSpecifics(scanner, type_pattern,
+        ParseFieldSpecifics(scanner,
+                            type_pattern,
                             MATCH_DEFAULT | MATCH_SELECT,
                             &credit_card_field->type_)) {
       continue;
     }
 
     // We look for a card security code before we look for a credit
     // card number and match the general term "number".  The security code
     // has a plethora of names; we've seen "verification #",
     // "verification number", "card identification number" and others listed
     // in the |pattern| below.
@@ skipping 10 matching lines @@
     }
 
     if (LowerCaseEqualsASCII(scanner->Cursor()->form_control_type, "month")) {
       credit_card_field->expiration_date_ = scanner->Cursor();
       scanner->Advance();
     } else {
       // First try to parse split month/year expiration fields.
       scanner->SaveCursor();
       pattern = base::UTF8ToUTF16(autofill::kExpirationMonthRe);
       if (!credit_card_field->expiration_month_ &&
-          ParseFieldSpecifics(scanner, pattern, MATCH_DEFAULT | MATCH_SELECT,
+          ParseFieldSpecifics(scanner,
+                              pattern,
+                              MATCH_DEFAULT | MATCH_SELECT,
                               &credit_card_field->expiration_month_)) {
         pattern = base::UTF8ToUTF16(autofill::kExpirationYearRe);
-        if (ParseFieldSpecifics(scanner, pattern, MATCH_DEFAULT | MATCH_SELECT,
-                                 &credit_card_field->expiration_year_)) {
+        if (ParseFieldSpecifics(scanner,
+                                pattern,
+                                MATCH_DEFAULT | MATCH_SELECT,
+                                &credit_card_field->expiration_year_)) {
           continue;
         }
       }
 
       // If that fails, try to parse a combined expiration field.
       if (!credit_card_field->expiration_date_) {
         // Look for a 2-digit year first.
         scanner->Rewind();
         pattern = base::UTF8ToUTF16(autofill::kExpirationDate2DigitYearRe);
         // We allow <select> fields, because they're used e.g. on qvc.com.
-        if (ParseFieldSpecifics(scanner, pattern,
-                                MATCH_LABEL | MATCH_VALUE | MATCH_TEXT |
-                                    MATCH_SELECT,
-                                &credit_card_field->expiration_date_)) {
-          credit_card_field->is_two_digit_year_ = true;
+        if (ParseFieldSpecifics(
+                scanner,
+                pattern,
+                MATCH_LABEL | MATCH_VALUE | MATCH_TEXT | MATCH_SELECT,
+                &credit_card_field->expiration_date_)) {
+          credit_card_field->exp_year_type_ = CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR;
           continue;
         }
 
         pattern = base::UTF8ToUTF16(autofill::kExpirationDateRe);
-        if (ParseFieldSpecifics(scanner, pattern,
-                                MATCH_LABEL | MATCH_VALUE | MATCH_TEXT |
-                                    MATCH_SELECT,
-                                &credit_card_field->expiration_date_)) {
+        if (ParseFieldSpecifics(
+                scanner,
+                pattern,
+                MATCH_LABEL | MATCH_VALUE | MATCH_TEXT | MATCH_SELECT,
+                &credit_card_field->expiration_date_)) {
           continue;
         }
       }
 
       if (credit_card_field->expiration_month_ &&
           !credit_card_field->expiration_year_ &&
           !credit_card_field->expiration_date_) {
         // Parsed a month but couldn't parse a year; give up.
         scanner->RewindTo(saved_cursor);
         return NULL;
@@ skipping 37 matching lines @@
 
 CreditCardField::CreditCardField()
     : cardholder_(NULL),
       cardholder_last_(NULL),
       type_(NULL),
       number_(NULL),
       verification_(NULL),
       expiration_month_(NULL),
       expiration_year_(NULL),
       expiration_date_(NULL),
-      is_two_digit_year_(false) {
+      exp_year_type_(CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR) {
 }
 
 bool CreditCardField::ClassifyField(ServerFieldTypeMap* map) const {
   bool ok = AddClassification(number_, CREDIT_CARD_NUMBER, map);
   ok = ok && AddClassification(type_, CREDIT_CARD_TYPE, map);
-  ok = ok && AddClassification(verification_, CREDIT_CARD_VERIFICATION_CODE,
-                               map);
+  ok = ok &&
+       AddClassification(verification_, CREDIT_CARD_VERIFICATION_CODE, map);
 
   // If the heuristics detected first and last name in separate fields,
   // then ignore both fields. Putting them into separate fields is probably
   // wrong, because the credit card can also contain a middle name or middle
   // initial.
   if (cardholder_last_ == NULL)
     ok = ok && AddClassification(cardholder_, CREDIT_CARD_NAME, map);
 
   if (expiration_date_) {
-    if (is_two_digit_year_) {
-      ok = ok && AddClassification(expiration_date_,
-                                   CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR, map);
-    } else {
-      ok = ok && AddClassification(expiration_date_,
-                                   CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR, map);
-    }
+    ok =
+        ok && AddClassification(expiration_date_, GetExpirationYearType(), map);
   } else {
     ok = ok && AddClassification(expiration_month_, CREDIT_CARD_EXP_MONTH, map);
-    if (is_two_digit_year_) {
-      ok = ok && AddClassification(expiration_year_,
-                                   CREDIT_CARD_EXP_2_DIGIT_YEAR,
-                                   map);
-    } else {
-      ok = ok && AddClassification(expiration_year_,
-                                   CREDIT_CARD_EXP_4_DIGIT_YEAR,
-                                   map);
-    }
+    ok =
+        ok && AddClassification(expiration_year_, GetExpirationYearType(), map);
   }
 
   return ok;
 }
 
+ServerFieldType CreditCardField::GetExpirationYearType() const {
+  return (expiration_date_
+              ? exp_year_type_
+              : ((expiration_year_ && expiration_year_->max_length == 2)
+                     ? CREDIT_CARD_EXP_2_DIGIT_YEAR
+                     : CREDIT_CARD_EXP_4_DIGIT_YEAR));
+}
+
 }  // namespace autofill