@matheusbsbs / matheus-bagliano / commits / f6e6362107

parse_date_basic(): let the system handle DST conversion

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>

Junio C Hamano committed Apr 15, 2015 at 08:47 UTC f6e6362107a1e7a798dc1c28ef439a3157813467

1 file changed +6 -2

date.c

+6 -2

@@ -694,13 +694,17 @@ int parse_date_basic(const char *date, unsigned long *timestamp, int *offset)

694 date += match;

695 }

696

697 - /* mktime uses local timezone */

697 + /* do not use mktime(), which uses local timezone, here */

698 *timestamp = tm_to_time_t(&tm);

699 if (*timestamp == -1)

700 return -1;

701

702 if (*offset == -1) {

703 - time_t temp_time = mktime(&tm);

703 + time_t temp_time;

704 +

705 + /* gmtime_r() in match_digit() may have clobbered it */

706 + tm.tm_isdst = -1;

707 + temp_time = mktime(&tm);

708 if ((time_t)*timestamp > temp_time) {

709 *offset = ((time_t)*timestamp - temp_time) / 60;

710 } else {