summaryrefslogtreecommitdiffstats
path: root/base/pr_time_unittest.cc
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 01:24:01 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 01:24:01 +0000
commit1e031a19d6c759a0bbb21cdcb26f099d009d8924 (patch)
tree99b79f5b3fc301be050c65b4bb8ccbaf7adc37b9 /base/pr_time_unittest.cc
parentdbf476de0ef1cdcc11c5f2d689b8755809a857fb (diff)
downloadchromium_src-1e031a19d6c759a0bbb21cdcb26f099d009d8924.zip
chromium_src-1e031a19d6c759a0bbb21cdcb26f099d009d8924.tar.gz
chromium_src-1e031a19d6c759a0bbb21cdcb26f099d009d8924.tar.bz2
Avoid a crash in mktime() when Visual C++ 2005 is
used and the input date is in year 3001. R=eroman BUG=4387 Review URL: http://codereview.chromium.org/28340 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/pr_time_unittest.cc')
-rw-r--r--base/pr_time_unittest.cc35
1 files changed, 32 insertions, 3 deletions
diff --git a/base/pr_time_unittest.cc b/base/pr_time_unittest.cc
index 3b096a2..2ebc724 100644
--- a/base/pr_time_unittest.cc
+++ b/base/pr_time_unittest.cc
@@ -136,7 +136,7 @@ TEST_F(PRTimeTest, ParseTimeTest9) {
// This tests the Time::FromString wrapper over PR_ParseTimeString
TEST_F(PRTimeTest, ParseTimeTest10) {
Time parsed_time;
- bool result = Time::FromString(L"15/10/07 12:45",&parsed_time);
+ bool result = Time::FromString(L"15/10/07 12:45", &parsed_time);
EXPECT_EQ(true, result);
time_t computed_time = parsed_time.ToTimeT();
@@ -172,7 +172,7 @@ TEST_F(PRTimeTest, ParseTimeTestEpoch0) {
TEST_F(PRTimeTest, ParseTimeTestEpoch1) {
Time parsed_time;
-
+
// time_t == 1 second after epoch == 1
EXPECT_EQ(true, Time::FromString(L"Thu Jan 01 01:00:01 +0100 1970",
&parsed_time));
@@ -184,7 +184,7 @@ TEST_F(PRTimeTest, ParseTimeTestEpoch1) {
TEST_F(PRTimeTest, ParseTimeTestEpoch2) {
Time parsed_time;
-
+
// time_t == 2 seconds after epoch == 2
EXPECT_EQ(true, Time::FromString(L"Thu Jan 01 01:00:02 +0100 1970",
&parsed_time));
@@ -238,4 +238,33 @@ TEST_F(PRTimeTest, ParseTimeTestEmpty) {
EXPECT_FALSE(Time::FromString(L"", &parsed_time));
}
+// This test should not crash when compiled with Visual C++ 2005 (see
+// http://crbug.com/4387).
+TEST_F(PRTimeTest, ParseTimeTestOutOfRange) {
+ PRTime parsed_time = 0;
+ // Note the lack of timezone in the time string. The year has to be 3001.
+ // The date has to be after 23:59:59, December 31, 3000, US Pacific Time, so
+ // we use January 2, 3001 to make sure it's after the magic maximum in any
+ // timezone.
+ PRStatus result = PR_ParseTimeString("Sun Jan 2 00:00:00 3001",
+ PR_FALSE, &parsed_time);
+ EXPECT_EQ(PR_SUCCESS, result);
+}
+
+TEST_F(PRTimeTest, ParseTimeTestNotNormalized1) {
+ PRTime parsed_time = 0;
+ PRStatus result = PR_ParseTimeString("Mon Oct 15 12:44:60 PDT 2007",
+ PR_FALSE, &parsed_time);
+ EXPECT_EQ(PR_SUCCESS, result);
+ EXPECT_EQ(comparison_time_pdt, parsed_time);
+}
+
+TEST_F(PRTimeTest, ParseTimeTestNotNormalized2) {
+ PRTime parsed_time = 0;
+ PRStatus result = PR_ParseTimeString("Sun Oct 14 36:45 PDT 2007",
+ PR_FALSE, &parsed_time);
+ EXPECT_EQ(PR_SUCCESS, result);
+ EXPECT_EQ(comparison_time_pdt, parsed_time);
+}
+
} // namespace