nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some bugs in parse_time

Browse Source 
svn:r1249
This commit is contained in:
Nick Mathewson 2004-03-09 22:17:35 +00:00
parent 0e5a134709
commit c230132562
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/or/routerlist.c
View File

@ -541,22 +541,22 @@ int router_exit_policy_rejects_all(routerinfo_t *router) {
== ADDR_POLICY_REJECTED; == ADDR_POLICY_REJECTED;
} }
static time_t parse_time(const char *cp) static int parse_time(const char *cp, time_t *t)
{ {
struct tm st_tm; struct tm st_tm;
#ifdef HAVE_STRPTIME #ifdef HAVE_STRPTIME
if (!strptime(cp, "%Y-%m-%d %H:%M:%S", &st_tm)) { if (!strptime(cp, "%Y-%m-%d %H:%M:%S", &st_tm)) {
log_fn(LOG_WARN, "Published time was unparseable"); return 0; log_fn(LOG_WARN, "Published time was unparseable"); return -1;
} }
#else #else
unsigned int year=0, month=0, day=0, hour=100, minute=100, second=100; unsigned int year=0, month=0, day=0, hour=100, minute=100, second=100;
if (scanf("%u-%u-%u %u:%u:%u", cp, &year, &month, if (sscanf(cp, "%u-%u-%u %u:%u:%u", &year, &month,
&day, &hour, &minute, &second) < 6) { &day, &hour, &minute, &second) < 6) {
log_fn(LOG_WARN, "Published time was unparseable"); return 0; log_fn(LOG_WARN, "Published time was unparseable"); return -1;
} }
if (year < 2000 || month < 1 || month > 12 || day < 1 || day > 31 || if (year < 1970 || month < 1 || month > 12 || day < 1 || day > 31 ||
hour > 24 || minute > 61 || second > 62) { hour > 24 || minute > 61 || second > 62) {
log_fn(LOG_WARN, "Published time was nonsensical"); return 0; log_fn(LOG_WARN, "Published time was nonsensical"); return -1;
} }
st_tm.tm_year = year; st_tm.tm_year = year;
st_tm.tm_mon = month; st_tm.tm_mon = month;
@ -565,8 +565,8 @@ static time_t parse_time(const char *cp)
st_tm.tm_min = minute; st_tm.tm_min = minute;
st_tm.tm_sec = second; st_tm.tm_sec = second;
#endif #endif
return tor_timegm(&st_tm); *t = tor_timegm(&st_tm);
return 0;
} }
@ -632,7 +632,7 @@ router_get_routerlist_from_directory_impl(const char *str,
} }
assert(tok->n_args == 1); assert(tok->n_args == 1);
if (!(published_on = parse_time(tok->args[0]))) { if (parse_time(tok->args[0], &published_on) < 0) {
goto err; goto err;
} }
@ -902,7 +902,7 @@ routerinfo_t *router_get_entry_from_string(const char *s,
log_fn(LOG_WARN, "Missing published time"); goto err; log_fn(LOG_WARN, "Missing published time"); goto err;
} }
assert(tok->n_args == 1); assert(tok->n_args == 1);
if (!(router->published_on = parse_time(tok->args[0]))) if (parse_time(tok->args[0], &router->published_on) < 0)
goto err; goto err;
if (!(tok = find_first_by_keyword(tokens, K_ONION_KEY))) { if (!(tok = find_first_by_keyword(tokens, K_ONION_KEY))) {