GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ISO8601d: Epoch strings are parsed without the same validation as other dates

Browse source
This commit is contained in:
Paul Beckingham 2015-09-27 16:28:25 -04:00
parent 5cc3c8d05d
commit b0e249e564
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/ISO8601.cpp
View file

@ -234,14 +234,13 @@ bool ISO8601d::parse (
auto i = start; auto i = start;
Nibbler n (input.substr (i)); Nibbler n (input.substr (i));
if (parse_formatted (n, format) || if (parse_formatted (n, format) ||
parse_date_time (n) || // Strictest first. parse_date_time (n) || // Strictest first.
parse_date_time_ext (n) || parse_date_time_ext (n) ||
parse_date_ext (n) || parse_date_ext (n) ||
parse_time_utc_ext (n) || parse_time_utc_ext (n) ||
parse_time_off_ext (n) || parse_time_off_ext (n) ||
parse_time_ext (n) || parse_time_ext (n) || // Time last, as it is the most permissive.
parse_named (n) || parse_named (n))
parse_epoch (n)) // Time last, as it is the most permissive.
{ {
// Check the values and determine time_t. // Check the values and determine time_t.
if (validate ()) if (validate ())
@ -254,6 +253,13 @@ bool ISO8601d::parse (
} }
} }
// ::parse_epoch doesn't require ::validate and ::resolve.
else if (parse_epoch (n))
{
start = n.cursor ();
return true;
}
return false; return false;
} }
@ -953,9 +959,9 @@ void ISO8601d::resolve ()
seconds %= 86400; seconds %= 86400;
} }
t.tm_hour = seconds / 3600; t.tm_hour = seconds / 3600;
t.tm_min = (seconds % 3600) / 60; t.tm_min = (seconds % 3600) / 60;
t.tm_sec = seconds % 60; t.tm_sec = seconds % 60;
_date = utc ? timegm (&t) : mktime (&t); _date = utc ? timegm (&t) : mktime (&t);
} }