diff options
| author | Lukas Fleischer <calcurse@cryptocrack.de> | 2013-02-27 11:00:26 +0100 |
|---|---|---|
| committer | Lukas Fleischer <calcurse@cryptocrack.de> | 2013-02-27 11:36:29 +0100 |
| commit | 9907069f442c56c90b67accb2d8fbd046dfce6db (patch) | |
| tree | aa7c5e31f7ede9e5262de253641948ec8b0dff11 /src/apoint.c | |
| parent | 43bdd12254082c58b04e0d3b3032569443e96e4f (diff) | |
| download | calcurse-9907069f442c56c90b67accb2d8fbd046dfce6db.zip | |
Validate date/time when scanning items
Bail out when reading dates such as "02/30/2013" from the appointments
file. These *could* be converted into valid dates but since we never
write invalid dates to that file, these indicate a user error.
Fixes following test cases:
* appointment-009.sh
* appointment-012.sh
* appointment-016.sh
* appointment-019.sh
* event-003.sh
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
Diffstat (limited to 'src/apoint.c')
| -rw-r--r-- | src/apoint.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/apoint.c b/src/apoint.c index 889c371..ca400e9 100644 --- a/src/apoint.c +++ b/src/apoint.c @@ -165,6 +165,12 @@ struct apoint *apoint_scan(FILE * f, struct tm start, struct tm end, char state, char buf[BUFSIZ], *newline; time_t tstart, tend; + EXIT_IF(!check_date(start.tm_year, start.tm_mon, start.tm_mday) || + !check_date(end.tm_year, end.tm_mon, end.tm_mday) || + !check_time(start.tm_hour, start.tm_min) || + !check_time(end.tm_hour, end.tm_min), + _("date error in appointment")); + /* Read the appointment description */ if (!fgets(buf, sizeof buf, f)) return NULL; |