fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix parsing of UNTIL in iCal import

Browse Source 
Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lars Henriksen 2020-11-09 09:46:59 +01:00 committed by Lukas Fleischer
parent e3dd92ef71
commit 0af69778b5
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ical.c
View File

@ -1055,7 +1055,7 @@ static struct rpt *ical_read_rrule(FILE *log, char *rrulestr,
time_t start, time_t start,
int *count) int *count)
{ {
char freqstr[8]; char freqstr[8], datestr[17];
struct rpt *rpt; struct rpt *rpt;
char *p, *q; char *p, *q;
@ -1084,7 +1084,7 @@ static struct rpt *ical_read_rrule(FILE *log, char *rrulestr,
/* FREQ rule part */ /* FREQ rule part */
if ((p = strstr(rrulestr, "FREQ="))) { if ((p = strstr(rrulestr, "FREQ="))) {
if (sscanf(p, "FREQ=%s", freqstr) != 1) { if (sscanf(p, "FREQ=%7s", freqstr) != 1) {
ical_log(log, ICAL_VEVENT, itemline, ical_log(log, ICAL_VEVENT, itemline,
_("frequency not set in rrule.")); _("frequency not set in rrule."));
(*noskipped)++; (*noskipped)++;
@ -1136,7 +1136,14 @@ static struct rpt *ical_read_rrule(FILE *log, char *rrulestr,
} }
if ((p = strstr(rrulestr, "UNTIL="))) { if ((p = strstr(rrulestr, "UNTIL="))) {
rpt->until = ical_datetime2time_t(strchr(p, '=') + 1, NULL, type); if (sscanf(p, "UNTIL=%16s", datestr) != 1) {
ical_log(log, ICAL_VEVENT, itemline,
_("missing until value."));
(*noskipped)++;
mem_free(rpt);
return NULL;
}
rpt->until = ical_datetime2time_t(datestr, NULL, type);
if (!rpt->until) { if (!rpt->until) {
ical_log(log, ICAL_VEVENT, itemline, ical_log(log, ICAL_VEVENT, itemline,
_("invalid until format.")); _("invalid until format."));