diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-12 15:33:35 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-12 15:33:35 -0400 |
| commit | 4165b1a0da893a9f67a2ba32b4fcd54a7804ce14 (patch) | |
| tree | edbb59f93ec3278d095cd57d6febfb164cd512ef | |
| parent | d40e8695f42959d180fe563d447422327535c753 (diff) | |
| parent | 20b01cece8cd2ceb7f8051aee04294bdba471f1a (diff) | |
| download | tor-4165b1a0da893a9f67a2ba32b4fcd54a7804ce14.tar.gz tor-4165b1a0da893a9f67a2ba32b4fcd54a7804ce14.zip | |
Merge branch 'bug18977_026_v2' into maint-0.2.7
| -rw-r--r-- | changes/bug18977 | 4 | ||||
| -rw-r--r-- | src/common/compat.c | 4 | ||||
| -rw-r--r-- | src/common/util.c | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/changes/bug18977 b/changes/bug18977 new file mode 100644 index 0000000000..3f46b09fba --- /dev/null +++ b/changes/bug18977 @@ -0,0 +1,4 @@ + o Minor bugfixes (time handling): + - When correcting a corrupt 'struct tm' value, fill in the tm_wday + field. Otherwise, our unit tests crash on Windows. + Fixes bug 18977; bugfix on 0.2.2.25-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index 7d72b4b7fd..98879c82c2 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2766,6 +2766,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, r->tm_mon = 11; r->tm_mday = 31; r->tm_yday = 364; + r->tm_wday = 6; r->tm_hour = 23; r->tm_min = 59; r->tm_sec = 59; @@ -2774,6 +2775,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, r->tm_mon = 0; r->tm_mday = 1; r->tm_yday = 0; + r->tm_wday = 0; r->tm_hour = 0; r->tm_min = 0; r->tm_sec = 0; @@ -2791,6 +2793,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, r->tm_mon = 0; r->tm_mday = 1; r->tm_yday = 0; + r->tm_wday = 0; r->tm_hour = 0; r->tm_min = 0 ; r->tm_sec = 0; @@ -2804,6 +2807,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, r->tm_mon = 11; r->tm_mday = 31; r->tm_yday = 364; + r->tm_wday = 6; r->tm_hour = 23; r->tm_min = 59; r->tm_sec = 59; diff --git a/src/common/util.c b/src/common/util.c index b33c80fd45..86f36b8eb8 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1676,6 +1676,7 @@ parse_iso_time_(const char *cp, time_t *t, int strict) st_tm.tm_hour = hour; st_tm.tm_min = minute; st_tm.tm_sec = second; + st_tm.tm_wday = 0; /* Should be ignored. */ if (st_tm.tm_year < 70) { char *esc = esc_for_log(cp); @@ -1743,6 +1744,7 @@ parse_http_time(const char *date, struct tm *tm) tm->tm_hour = (int)tm_hour; tm->tm_min = (int)tm_min; tm->tm_sec = (int)tm_sec; + tm->tm_wday = 0; /* Leave this unset. */ month[3] = '\0'; /* Okay, now decode the month. */ |