[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:18:37 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 94e6d75eb0ad795fec7633624d28d471ba46a1cb
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 3 18:28:07 2003 +0000

            Reviewed by Maciej.
    
    	- fixed 3138213 -- browser hangs trying to open Apple travel site
    
            * kjs/date_object.cpp: (timetUsingCF): Check for very-negative year numbers too.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3245 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 4e97582..d3d34cf 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-02  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- fixed 3138213 -- browser hangs trying to open Apple travel site
+
+        * kjs/date_object.cpp: (timetUsingCF): Check for very-negative year numbers too.
+
 === Alexander-48 ===
 
 === Alexander-47 ===
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 4e97582..d3d34cf 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2003-01-02  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- fixed 3138213 -- browser hangs trying to open Apple travel site
+
+        * kjs/date_object.cpp: (timetUsingCF): Check for very-negative year numbers too.
+
 === Alexander-48 ===
 
 === Alexander-47 ===
diff --git a/JavaScriptCore/kjs/date_object.cpp b/JavaScriptCore/kjs/date_object.cpp
index b2bb0b3..d3c50a9 100644
--- a/JavaScriptCore/kjs/date_object.cpp
+++ b/JavaScriptCore/kjs/date_object.cpp
@@ -133,9 +133,9 @@ static time_t timetUsingCF(struct tm *tm, CFTimeZoneRef timeZone)
     date.month = tm->tm_mon + 1;
     date.year = tm->tm_year + 1900;
 
-    // CFGregorianDateGetAbsoluteTime will go nuts if the year is too large,
+    // CFGregorianDateGetAbsoluteTime will go nuts if the year is too large or small,
     // so we pick an arbitrary cutoff.
-    if (date.year > 2500) {
+    if (date.year < -2500 || date.year > 2500) {
         return invalidDate;
     }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list