Changeset 10675 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Sep 30, 2005, 9:16:13 AM (20 years ago)

Author:

ggaren

Message:

• Second cut at fixing <rdar://problem/4275206> Denver Regression: Seed: Past Editions of Opinions display "NAN/Undefined" for www.washingtonpost.com

Reviewed by john.

• kjs/date_object.cpp: (KJS::KRFCDate_parseDate): Intead of creating a timezone when one isn't specified, just rely on the fallback logic, which will do it for you. Also, return invalidDate if the date includes trailing garbage. (Somewhat accidentally, the timezone logic used to catch trailing garbage.)

Added test case to fast/js/date-parse-test.html.

File:

• trunk/JavaScriptCore/kjs/date_object.cpp (modified) (6 diffs)

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -1092 +1092 @@
      //
      double result = -1;
-     long offset = 0;
+     int offset = 0;
      bool have_tz = false;
      char *newPosStr;
@@ -1301 +1301 @@
      }
 
+     // Don't fail if the time zone is missing. 
+     // Some websites omit the time zone (4275206).
      if (*dateString) {
        if (strncasecmp(dateString, "GMT", 3) == 0 ||
@@ -1339 +1341 @@
            if (0 == strncasecmp(dateString, known_zones[i].tzName, strlen(known_zones[i].tzName))) {
              offset = known_zones[i].tzOffset;
+             dateString += strlen(known_zones[i].tzName);
              have_tz = true;
              break;
            }
          }
-         // If the time zone is missing or malformed, substitute the local time zone. 
-         // Some websites (4275206) omit the time zone.
-         if (!have_tz) {
-           time_t now;
-           struct tm t;
-           
-           time(&now);
-           if (now == -1)
-             return invalidDate;
-           
-           localtime_r(&now, &t);
-           offset = -timeZoneOffset(&t);
-           
-           have_tz = true;
-         }
        }
      }
@@ -1368 +1356 @@
        if (errno)
          return invalidDate;
+       dateString = newPosStr;
      }
+     
+     while (isspace(*dateString))
+       dateString++;
+     
+     // Trailing garbage
+     if (*dateString != '\0')
+       return invalidDate;
 
      // Y2K: Solve 2 digit years
@@ -1377 +1373 @@
          year += 1900;  // Y2K
 
+     // fall back to midnight, local timezone
      if (!have_tz) {
-       // fall back to midnight, local timezone
        struct tm t;
        memset(&t, 0, sizeof(tm));
@@ -1395 +1391 @@
      }
      
-     result = ymdhms_to_seconds(year, month+1, day, hour, minute, second) - (offset * 60);
+     result = ymdhms_to_seconds(year, month + 1, day, hour, minute, second) - (offset * 60);
      return result;
 }