[tor-commits] [tor/release-0.2.8] Have correct_tm set tm_wday as well.

[nickm@xxxxxxxxxxxxxx]

commit e57f26c135b03f5dbde77aea24551b6a9fc20889
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu May 5 10:49:55 2016 -0400

    Have correct_tm set tm_wday as well.
    
    The tm_wday field had been left uninitialized, which was causing
    some assertions to fail on Windows unit tests.
    
    Fixes bug 18977.
---
 changes/bug18977    | 4 ++++
 src/common/compat.c | 3 +++
 src/common/util.c   | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/changes/bug18977 b/changes/bug18977
new file mode 100644
index 0000000..3f46b09
--- /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 d88c5f9..90132fc 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -2462,6 +2462,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf,
       r->tm_mon = 11;
       r->tm_mday = 31;
       r->tm_yday = 365;
+      r->tm_wday = 6;
       r->tm_hour = 23;
       r->tm_min = 59;
       r->tm_sec = 59;
@@ -2479,6 +2480,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf,
       r->tm_mon = 0;
       r->tm_mday = 1;
       r->tm_yday = 1;
+      r->tm_wday = 0;
       r->tm_hour = 0;
       r->tm_min = 0 ;
       r->tm_sec = 0;
@@ -2492,6 +2494,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf,
       r->tm_mon = 11;
       r->tm_mday = 31;
       r->tm_yday = 365;
+      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 5eb0f9a..31dc2a4 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1460,6 +1460,7 @@ parse_iso_time(const char *cp, time_t *t)
   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);
@@ -1517,6 +1518,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. */



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits