icalrecur: Ignore time-related BY* if DTSTART is date-only.

Author: minichma

src/libical/icalrecur.c

@@ -396,16 +396,17 @@ static const struct recur_map {
     const char *str;
     int size;
     int min;
+    int isTime;
 } recur_map[] = {
-    {"BYMONTH", ICAL_BY_MONTH_SIZE, 1},
-    {"BYWEEKNO", ICAL_BY_WEEKNO_SIZE, -1},
-    {"BYYEARDAY", ICAL_BY_YEARDAY_SIZE, -1},
-    {"BYMONTHDAY", ICAL_BY_MONTHDAY_SIZE, -1},
-    {"BYDAY", ICAL_BY_DAY_SIZE, 0},
-    {"BYHOUR", ICAL_BY_HOUR_SIZE, 0},
-    {"BYMINUTE", ICAL_BY_MINUTE_SIZE, 0},
-    {"BYSECOND", ICAL_BY_SECOND_SIZE, 0},
-    {"BYSETPOS", ICAL_BY_SETPOS_SIZE, -1},
+    {"BYMONTH", ICAL_BY_MONTH_SIZE, 1, 0},
+    {"BYWEEKNO", ICAL_BY_WEEKNO_SIZE, -1, 0},
+    {"BYYEARDAY", ICAL_BY_YEARDAY_SIZE, -1, 0},
+    {"BYMONTHDAY", ICAL_BY_MONTHDAY_SIZE, -1, 0},
+    {"BYDAY", ICAL_BY_DAY_SIZE, 0, 0},
+    {"BYHOUR", ICAL_BY_HOUR_SIZE, 0, 1},
+    {"BYMINUTE", ICAL_BY_MINUTE_SIZE, 0, 1},
+    {"BYSECOND", ICAL_BY_SECOND_SIZE, 0, 1},
+    {"BYSETPOS", ICAL_BY_SETPOS_SIZE, -1, 0},
 };
 
 static const char *icalrecur_first_clause(struct icalrecur_parser *parser)
@@ -1162,7 +1163,14 @@ static void setup_defaults(icalrecur_iterator *impl,
 {
     icalrecurrencetype_frequency freq = impl->rule->freq;
 
-    if (expand_map[freq].map[byrule] == EXPAND) {
+    if (impl->dtstart.is_date && recur_map[byrule].isTime) {
+        // The BYSECOND, BYMINUTE and BYHOUR rule parts MUST NOT be specified
+        // when the associated "DTSTART" property has a DATE value type.
+        // These rule parts MUST be ignored in RECUR value that violate the
+        // above requirement (e.g., generated by applications that pre-date
+        // this revision of iCalendar).
+        recur_iterator_set_static_single_by_value(impl, byrule, 0);
+    } else if (expand_map[freq].map[byrule] == EXPAND) {
         /* Re-write the BY rule arrays with data from the DTSTART time so
            we don't have to explicitly deal with DTSTART */
         if (impl->bydata[byrule].by.size == 0) {