diff options
| author | Douglas Christman <DouglasChristman@gmail.com> | 2016-11-24 12:47:55 -0500 |
|---|---|---|
| committer | Douglas Christman <DouglasChristman@gmail.com> | 2016-11-24 18:22:08 -0500 |
| commit | 9dfa81a00a9a7d4536f96848119c5ad40d9d72b4 (patch) | |
| tree | 2d8407112c6a71685dc44c7be05f72140912be09 | |
| parent | 6bae2fd4cdddd6c34f3d5e79906d8f6a75125922 (diff) | |
calendarspec: reject strings with spurious spaces and signs
strtoul() parses leading whitespace and an optional sign;
check that the first character is a digit to prevent odd
specifications like "00: 00: 00" and "-00:+00/-1".
| -rw-r--r-- | src/basic/calendarspec.c | 4 | ||||
| -rw-r--r-- | src/test/test-calendarspec.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/basic/calendarspec.c b/src/basic/calendarspec.c index eef4ed5240..1555230e30 100644 --- a/src/basic/calendarspec.c +++ b/src/basic/calendarspec.c @@ -18,6 +18,7 @@ ***/ #include <alloca.h> +#include <ctype.h> #include <errno.h> #include <stddef.h> #include <stdio.h> @@ -458,6 +459,9 @@ static int parse_component_decimal(const char **p, bool usec, unsigned long *res char *ee = NULL; int r; + if (!isdigit(**p)) + return -EINVAL; + errno = 0; value = strtoul(*p, &ee, 10); if (errno > 0) diff --git a/src/test/test-calendarspec.c b/src/test/test-calendarspec.c index 93414c8508..873a4910d2 100644 --- a/src/test/test-calendarspec.c +++ b/src/test/test-calendarspec.c @@ -216,6 +216,9 @@ int main(int argc, char* argv[]) { assert_se(calendar_spec_from_string("*-*~5/5", &c) < 0); assert_se(calendar_spec_from_string("Monday.. 12:00", &c) < 0); assert_se(calendar_spec_from_string("Monday..", &c) < 0); + assert_se(calendar_spec_from_string("-00:+00/-5", &c) < 0); + assert_se(calendar_spec_from_string("00:+00/-5", &c) < 0); + assert_se(calendar_spec_from_string("2016- 11- 24 12: 30: 00", &c) < 0); test_timestamp(); test_hourly_bug_4031(); |