Code change by Eric Albert, reviewd by me.

	<rdar://problem/3571960> washingtonpost.com claims I don't have cookies enabled and won't let me read articles

        * kjs/date_object.cpp:
        (timetUsingCF): Clamp time to LONG_MAX (getting rid of time_t
	entirely would be even better, but is not required to fix this bug.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7280 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index f20bc9cbf5beff6a2fa93004719990b49b6b00cc..bc7a8d09e1ebfa7f5d178d96c86313a4b09ec54e 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2004-08-16  Maciej Stachowiak  <mjs@apple.com>
+
+        Code change by Eric Albert, reviewd by me.
+
+       <rdar://problem/3571960> washingtonpost.com claims I don't have cookies enabled and won't let me read articles
+
+        * kjs/date_object.cpp:
+        (timetUsingCF): Clamp time to LONG_MAX (getting rid of time_t
+       entirely would be even better, but is not required to fix this bug.
+
 === Safari-157 ===
 
 2004-08-16  Richard Williamson   <rjw@apple.com>

diff --git a/JavaScriptCore/kjs/date_object.cpp b/JavaScriptCore/kjs/date_object.cpp
index e81796eba3dced136310388bad757e4e4da4aa81..fe1201babf92d093a68d505d278613f77807c0d8 100644 (file)
--- a/JavaScriptCore/kjs/date_object.cpp
+++ b/JavaScriptCore/kjs/date_object.cpp
@@ -175,8 +175,12 @@ static time_t timetUsingCF(struct tm *tm, CFTimeZoneRef timeZone)
     }
 
     CFAbsoluteTime absoluteTime = CFGregorianDateGetAbsoluteTime(date, timeZone);
+       CFTimeInterval interval = absoluteTime + kCFAbsoluteTimeIntervalSince1970;
+       if (interval > LONG_MAX) {
+               interval = LONG_MAX;
+       }
 
-    return (time_t)(absoluteTime + kCFAbsoluteTimeIntervalSince1970);
+    return (time_t) interval;
 }
 
 static time_t mktimeUsingCF(struct tm *tm)