Changeset 35198 in webkit for trunk/JavaScriptCore/kjs/DateMath.cpp

Timestamp:

Jul 16, 2008, 3:14:03 AM (17 years ago)

Author:

Simon Hausmann

Message:

2008-07-16 Ariya Hidayat <​[email protected]>

Reviewed by Simon.

​http://trolltech.com/developer/task-tracker/index_html?method=entry&id=216179
Fix potential crash (on Qt for Windows port) when performing JavaScript date
conversion.

• kjs/DateMath.cpp: (KJS::getLocalTime): For the Qt port, prefer to use Windows code, i.e. localtime_s() instead of localtime() since the latter might crash (on Windows) given a non-sensible, e.g. NaN, argument.

File:

• trunk/JavaScriptCore/kjs/DateMath.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/DateMath.cpp

@@ -310 +310 @@
 void getLocalTime(const time_t* localTime, struct tm* localTM)
 {
-#if PLATFORM(QT)
+#if PLATFORM(WIN_OS)
+#if COMPILER(MSVC7)
+    *localTM = *localtime(localTime);
+#else
+    localtime_s(localTM, localTime);
+#endif
+#elif PLATFORM(QT)
 #if USE(MULTIPLE_THREADS)
-#error Mulitple threads are currently not supported in the Qt/mingw build
+#error Multiple threads are currently not supported in the Qt/mingw build
 #endif
     *localTM = *localtime(localTime);
-#elif PLATFORM(WIN_OS)
-    #if COMPILER(MSVC7)
-    *localTM = *localtime(localTime);
-    #else
-    localtime_s(localTM, localTime);
-    #endif
 #else
     localtime_r(localTime, localTM);