Commit 679aa93e authored by Sebastian Hahn's avatar Sebastian Hahn Committed by Nick Mathewson
Browse files

Fix month check in parse_http_time, add test

parent 801923ac

src/common/util.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1451,6 +1451,8 @@ parse_http_time(const char *date, struct tm *tm) 




  month[3] = '\0';

  month[3] = '\0';

  /* Okay, now decode the month. */

  /* Okay, now decode the month. */

  /* set tm->tm_mon to dummy value so the check below fails. */

  tm->tm_mon = -1;

  for (i = 0; i < 12; ++i) {

  for (i = 0; i < 12; ++i) {

    if (!strcasecmp(MONTH_NAMES[i], month)) {

    if (!strcasecmp(MONTH_NAMES[i], month)) {

      tm->tm_mon = i;

      tm->tm_mon = i;

src/test/test_util.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -121,6 +121,10 @@ test_util_parse_http_time(void *arg) 
  test_eq((time_t)775961302UL, tor_timegm(&a_time));

  test_eq((time_t)775961302UL, tor_timegm(&a_time));

  test_eq(0, parse_http_time("Mie Aug 4 0:48:22 1994", &a_time));

  test_eq(0, parse_http_time("Mie Aug 4 0:48:22 1994", &a_time));

  test_eq((time_t)775961302UL, tor_timegm(&a_time));

  test_eq((time_t)775961302UL, tor_timegm(&a_time));

  test_eq(0, parse_http_time("Sun, 1 Jan 2012 00:00:00 GMT", &a_time));

  test_eq((time_t)1325376000UL, tor_timegm(&a_time));

  test_eq(0, parse_http_time("Mon, 31 Dec 2012 00:00:00 GMT", &a_time));

  test_eq((time_t)1356912000UL, tor_timegm(&a_time));

  test_eq(-1, parse_http_time("2004-08-zz 99-99x99 GMT", &a_time));

  test_eq(-1, parse_http_time("2004-08-zz 99-99x99 GMT", &a_time));

  test_eq(-1, parse_http_time("2011-03-32 00:00:00 GMT", &a_time));

  test_eq(-1, parse_http_time("2011-03-32 00:00:00 GMT", &a_time));

  test_eq(-1, parse_http_time("2011-03-30 24:00:00 GMT", &a_time));

  test_eq(-1, parse_http_time("2011-03-30 24:00:00 GMT", &a_time));