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

Correctly parse all types of iCal durations

Browse Source 
This was supposed to be fixed in 6ca2535 (ical.c: Simplify and fix
ical_durtime2long(), 2014-07-28) but some cases were not covered.

Reported-by: Håkan Jerning <jerning@home.se>
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer
2014-08-18 15:13:46 +02:00
parent 0a2c4d20fe
commit 76f151ff37
4 changed files with 124 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/ical.c
View File

@@ -510,6 +510,7 @@ static long ical_datetime2long(char *datestr, ical_vevent_e * type)
static long ical_durtime2long(char *timestr)
{
char *p;
int bytes_read;
unsigned hour = 0, min = 0, sec = 0;
if ((p = strchr(timestr, 'T')) == NULL)
@@ -517,15 +518,23 @@ static long ical_durtime2long(char *timestr)
p++;
if (strchr(p, 'H')) {
if (sscanf(p, "%uH%uM%uS", &hour, &min, &sec) != 3)
return 0;
} else if (strchr(p, 'M')) {
if (sscanf(p, "%uM%uS", &min, &sec) != 2)
return 0;
} else if (strchr(p, 'S')) {
if (sscanf(p, "%uS", &sec) != 1)
if (sscanf(p, "%uH%n", &hour, &bytes_read) != 1)
return 0;
p += bytes_read;
}
if (strchr(p, 'M')) {
if (sscanf(p, "%uM%n", &min, &bytes_read) != 1)
return 0;
p += bytes_read;
}
if (strchr(p, 'S')) {
if (sscanf(p, "%uM%n", &sec, &bytes_read) != 1)
return 0;
p += bytes_read;
}
if (hour == 0 && min == 0 && sec == 0)
return 0;
return hour * HOURINSEC + min * MININSEC + sec;
}