From dd91e772430dc294e3bf478c119ef8d43c0a3358 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 12 Mar 2012 14:11:15 +0100 Subject: Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422) This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API. --- Source/JavaScriptCore/wtf/DateMath.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Source/JavaScriptCore/wtf/DateMath.cpp') diff --git a/Source/JavaScriptCore/wtf/DateMath.cpp b/Source/JavaScriptCore/wtf/DateMath.cpp index dc503ca2a..cf601a5ec 100644 --- a/Source/JavaScriptCore/wtf/DateMath.cpp +++ b/Source/JavaScriptCore/wtf/DateMath.cpp @@ -935,6 +935,14 @@ double parseDateFromNullTerminatedCharacters(const char* dateString, bool& haveT } } } + + // The year may be after the time but before the time zone. + if (isASCIIDigit(*dateString) && year == -1) { + if (!parseLong(dateString, &newPosStr, 10, &year)) + return std::numeric_limits::quiet_NaN(); + dateString = newPosStr; + skipSpacesAndComments(dateString); + } // Don't fail if the time zone is missing. // Some websites omit the time zone (4275206). @@ -987,10 +995,9 @@ double parseDateFromNullTerminatedCharacters(const char* dateString, bool& haveT if (!parseLong(dateString, &newPosStr, 10, &year)) return std::numeric_limits::quiet_NaN(); dateString = newPosStr; + skipSpacesAndComments(dateString); } - skipSpacesAndComments(dateString); - // Trailing garbage if (*dateString) return std::numeric_limits::quiet_NaN(); -- cgit v1.2.1