Fix the "ls -l" style date parser to correctly guess the year if it is not provided.

net/ftp/ftp_util.cc

 // Copyright (c) 2009 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 "net/ftp/ftp_util.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/string_tokenizer.h"
@@ skipping 129 matching lines @@
   if (text == ASCIIToUTF16("Dez")) {
     *number = 12;
     return true;
   }
 
   return false;
 }
 
 // static
 bool FtpUtil::LsDateListingToTime(const string16& month, const string16& day,
-                                  const string16& rest, base::Time* time) {
+                                  const string16& rest,
+                                  const base::Time& current_time,
+                                  base::Time* result) {
   base::Time::Exploded time_exploded = { 0 };
 
   if (!ThreeLetterMonthToNumber(month, &time_exploded.month))
     return false;
 
   if (!StringToInt(day, &time_exploded.day_of_month))
     return false;
 
   if (!StringToInt(rest, &time_exploded.year)) {
     // Maybe it's time. Does it look like time (MM:HH)?
     if (rest.length() != 5 || rest[2] != ':')
       return false;
 
     if (!StringToInt(rest.substr(0, 2), &time_exploded.hour))
       return false;
 
     if (!StringToInt(rest.substr(3, 2), &time_exploded.minute))
       return false;
 
-    // Use current year.
-    base::Time::Exploded now_exploded;
-    base::Time::Now().LocalExplode(&now_exploded);
-    time_exploded.year = now_exploded.year;
+    // Guess the year.
+    base::Time::Exploded current_exploded;
+    current_time.LocalExplode(&current_exploded);
+
+    // If it's not possible for the parsed date to be in the current year,
+    // use the previous year.
+    if (time_exploded.month > current_exploded.month ||
+        (time_exploded.month == current_exploded.month &&
+         time_exploded.day_of_month > current_exploded.day_of_month)) {
+      time_exploded.year = current_exploded.year - 1;
+    } else {
+      time_exploded.year = current_exploded.year;
+    }
   }
 
   // We don't know the time zone of the listing, so just use local time.
-  *time = base::Time::FromLocalExploded(time_exploded);
+  *result = base::Time::FromLocalExploded(time_exploded);
   return true;
 }
 
 // static
 string16 FtpUtil::GetStringPartAfterColumns(const string16& text, int columns) {
   size_t pos = 0;
 
   for (int i = 0; i < columns; i++) {
     // Skip the leading whitespace.
     while (pos < text.length() && isspace(text[pos]))
       pos++;
 
     // Skip the actual text of i-th column.
     while (pos < text.length() && !isspace(text[pos]))
       pos++;
   }
 
   string16 result(text.substr(pos));
   TrimWhitespace(result, TRIM_ALL, &result);
   return result;
 }
 
 }  // namespace