[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 998af8b086091d8f7dec9bfb1ff7caa103b892e2
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 13 05:08:00 2009 +0000

    2009-11-12  Steve VanDeBogart  <vandebo at chromium.org>
    
            Reviewed by Adam Barth.
    
            Calculate the time offset only if we were able to parse
            the date string. This saves an IPC in Chromium for
            invalid date strings.
            https://bugs.webkit.org/show_bug.cgi?id=31416
    
            * wtf/DateMath.cpp:
            (WTF::parseDateFromNullTerminatedCharacters):
            (JSC::parseDateFromNullTerminatedCharacters):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50927 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 03efd6d..7d535ef 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-12  Steve VanDeBogart  <vandebo at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Calculate the time offset only if we were able to parse
+        the date string. This saves an IPC in Chromium for
+        invalid date strings.
+        https://bugs.webkit.org/show_bug.cgi?id=31416
+
+        * wtf/DateMath.cpp:
+        (WTF::parseDateFromNullTerminatedCharacters):
+        (JSC::parseDateFromNullTerminatedCharacters):
+
 2009-11-12  Oliver Hunt  <oliver at apple.com>
 
         Rollout r50896 until i can work out why it causes failures.
diff --git a/JavaScriptCore/wtf/DateMath.cpp b/JavaScriptCore/wtf/DateMath.cpp
index e45c560..1697df5 100644
--- a/JavaScriptCore/wtf/DateMath.cpp
+++ b/JavaScriptCore/wtf/DateMath.cpp
@@ -824,6 +824,9 @@ double parseDateFromNullTerminatedCharacters(const char* dateString)
     bool haveTZ;
     int offset;
     double ms = parseDateFromNullTerminatedCharacters(dateString, haveTZ, offset);
+    if (isnan(ms))
+        return NaN;
+
     // fall back to local timezone
     if (!haveTZ) {
         double utcOffset = calculateUTCOffset();
@@ -967,6 +970,9 @@ double parseDateFromNullTerminatedCharacters(ExecState* exec, const char* dateSt
     bool haveTZ;
     int offset;
     double ms = WTF::parseDateFromNullTerminatedCharacters(dateString, haveTZ, offset);
+    if (isnan(ms))
+        return NaN;
+
     // fall back to local timezone
     if (!haveTZ) {
         double utcOffset = getUTCOffset(exec);

-- 
WebKit Debian packaging