AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Add safe handling of NaN to Posix platform-dependent time functions.

Browse Source 
Review URL: http://codereview.chromium.org/160580

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@2615 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
whesse@chromium.org 2009-08-04 09:41:18 +00:00
parent e05ea61528
commit 3703231636
3 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/date-delay.js
View File

@ -156,8 +156,7 @@ var DST_offset_cache = {
// NOTE: The implementation relies on the fact that no time zones have
// more than one daylight savings offset change per month.
// This function must never be called with the argument NaN.
// All uses of it are guarded so this does not happen.
// If this function is called with NaN it returns NaN.
function DaylightSavingsOffset(t) {
// Load the cache object from the builtins object.
var cache = DST_offset_cache;
@ -652,12 +651,13 @@ function TimeString(time) {
function LocalTimezoneString(time) {
// time is not NaN because of checks in calling functions.
var timezoneOffset = (local_time_offset + DaylightSavingsOffset(time)) / msPerMinute;
var timezoneOffset =
(local_time_offset + DaylightSavingsOffset(time)) / msPerMinute;
var sign = (timezoneOffset >= 0) ? 1 : -1;
var hours = FLOOR((sign * timezoneOffset)/60);
var min = FLOOR((sign * timezoneOffset)%60);
var gmt = ' GMT' + ((sign == 1) ? '+' : '-') + TwoDigitString(hours) + TwoDigitString(min);
var gmt = ' GMT' + ((sign == 1) ? '+' : '-') +
TwoDigitString(hours) + TwoDigitString(min);
return gmt + ' (' + LocalTimezone(time) + ')';
}

4
src/platform-posix.cc
View File

@ -87,7 +87,7 @@ int64_t OS::Ticks() {
const char* OS::LocalTimezone(double time) {
ASSERT(!isnan(time));
if (isnan(time)) return "";
time_t tv = static_cast<time_t>(floor(time/msPerSecond));
struct tm* t = localtime(&tv);
if (NULL == t) return "";
@ -96,7 +96,7 @@ const char* OS::LocalTimezone(double time) {
double OS::DaylightSavingsOffset(double time) {
ASSERT(!isnan(time));
if (isnan(time)) return nan_value();
time_t tv = static_cast<time_t>(floor(time/msPerSecond));
struct tm* t = localtime(&tv);
if (NULL == t) return nan_value();

38
test/mjsunit/regress/regress-416.js Normal file
View File

@ -0,0 +1,38 @@
// Copyright 2009 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following
// disclaimer in the documentation and/or other materials provided
// with the distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived
// from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Test of invalid Date construction, and TimeClip function.
// See http://code.google.com/p/v8/issues/detail?id=416
assertTrue(isNaN(new Date(1e81).getTime()), "new Date(1e81)");
assertTrue(isNaN(new Date(-1e81).getTime()), "new Date(-1e81)");
assertTrue(isNaN(new Date(1e81, "").getTime()), "new Date(1e81, \"\")");
assertTrue(isNaN(new Date(-1e81, "").getTime()), "new Date(-1e81, \"\")");
assertTrue(isNaN(new Date(Number.NaN).getTime()), "new Date(Number.NaN)");
assertTrue(isNaN(new Date(Number.NaN, "").getTime()),
"new Date(Number.NaN, \"\")");