summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-04-15 08:47:48 -0700
committerJunio C Hamano <gitster@pobox.com>2015-04-15 10:25:32 -0700
commitf6e6362107a1e7a798dc1c28ef439a3157813467 (patch)
treec28c8644298e4e6dfcfee372e4975ac1263c3cc0
parent7fcec48da90f95dc64268ebd4b3073ae9487fe4e (diff)
downloadgit-f6e6362107a1e7a798dc1c28ef439a3157813467.tar.gz
parse_date_basic(): let the system handle DST conversionjc/epochtime-wo-tz
The function parses the input to compute the broken-down time in "struct tm", and the GMT timezone offset. If the timezone offset does not exist in the input, the broken-down time is turned into the number of seconds since epoch both in the current timezone and in GMT and the offset is computed as their difference. However, we forgot to make sure tm.tm_isdst is set to -1 (i.e. let the system figure out if DST is in effect in the current timezone when turning the broken-down time to the number of seconds since epoch); it is done so at the beginning of the function, but a call to match_digit() in the function can lead to a call to gmtime_r() to clobber the field. Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Diagnosed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--date.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/date.c b/date.c
index 76fb47518d..52a99448d2 100644
--- a/date.c
+++ b/date.c
@@ -694,13 +694,17 @@ int parse_date_basic(const char *date, unsigned long *timestamp, int *offset)
date += match;
}
- /* mktime uses local timezone */
+ /* do not use mktime(), which uses local timezone, here */
*timestamp = tm_to_time_t(&tm);
if (*timestamp == -1)
return -1;
if (*offset == -1) {
- time_t temp_time = mktime(&tm);
+ time_t temp_time;
+
+ /* gmtime_r() in match_digit() may have clobbered it */
+ tm.tm_isdst = -1;
+ temp_time = mktime(&tm);
if ((time_t)*timestamp > temp_time) {
*offset = ((time_t)*timestamp - temp_time) / 60;
} else {