icalrecur.c: properly handle multiple BYWEEKNO values

1 files changed, 6 insertions, 2 deletions

diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c
index f48d063b..f8f42d71 100644
--- a/src/libical/icalrecur.c
+++ b/src/libical/icalrecur.c
@@ -2417,7 +2417,7 @@ static int expand_by_day(icalrecur_iterator *impl, int year,
 
         /* Add instance(s) of the weekday within the period */
         do {
-            int valid = 1;
+            int valid = 0;
 
             if (has_by_data(impl, BY_WEEK_NO)) {
                 /* Make sure our day falls in one of the BYWEEKNO */
@@ -2426,9 +2426,13 @@ static int expand_by_day(icalrecur_iterator *impl, int year,
                 for (j = 0; BYWEEKPTR[j] != ICAL_RECURRENCE_ARRAY_MAX; j++) {
                     int weekno = BYWEEKPTR[j];
 
-                    if (weekno != this_weekno) valid = 0;
+                    if (weekno == this_weekno) {
+                        valid = 1;
+                        break;
+                    }
                 }
             }
+            else valid = 1;
 
             if (valid) {
                 daysmask_setbit(bydays, day + doy_offset, 1);