generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 8eda0a6d: Merge "libc: Fix mktime returns an uncorrect time in empty TZ case"

Browse Source 
* commit '8eda0a6d69fda865b576bc18311a3d79c84b42a1':
  libc: Fix mktime returns an uncorrect time in empty TZ case
This commit is contained in:
Elliott Hughes
2014-11-17 23:18:39 +00:00
committed by Android Git Automerger
parent 78d809fd4b 8eda0a6d69
commit cbdc7e6883
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libc/tzcode/localtime.c
View File

@@ -1257,6 +1257,7 @@ tzset_locked(void)
lclptr->ttis[0].tt_gmtoff = 0;
lclptr->ttis[0].tt_abbrind = 0;
(void) strcpy(lclptr->chars, gmt);
lclptr->defaulttype = 0;
} else if (tzload(name, lclptr, TRUE) != 0)
if (name[0] == ':' || tzparse(name, lclptr, FALSE) != 0)
(void) gmtload(lclptr);

24
tests/time_test.cpp
View File

@@ -71,6 +71,30 @@ TEST(time, gmtime_no_stack_overflow_14313703) {
ASSERT_EQ(0, pthread_join(t, &result));
}
TEST(time, mktime_empty_TZ) {
// tzcode used to have a bug where it didn't reinitialize some internal state.
// Choose a time where DST is set.
struct tm t;
memset(&t, 0, sizeof(tm));
t.tm_year = 1980 - 1900;
t.tm_mon = 6;
t.tm_mday = 2;
setenv("TZ", "America/Los_Angeles", 1);
tzset();
ASSERT_EQ(static_cast<time_t>(331372800U), mktime(&t));
memset(&t, 0, sizeof(tm));
t.tm_year = 1980 - 1900;
t.tm_mon = 6;
t.tm_mday = 2;
setenv("TZ", "", 1); // Implies UTC.
tzset();
ASSERT_EQ(static_cast<time_t>(331344000U), mktime(&t));
}
TEST(time, mktime_10310929) {
struct tm t;
memset(&t, 0, sizeof(tm));