Fix invalid occurrences for BYDAY rrules

Fixes fmeringdal#104
sciyoshi · Apr 1, 2024 · 9ce978c · 9ce978c
1 parent e49c6ca
commit 9ce978c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/rrule/src/iter/counter_date.rs b/rrule/src/iter/counter_date.rs
@@ -76,7 +76,8 @@ impl DateTimeIter {
                 self.month = 12;
                 year_div -= 1;
             }
-            self.increment_yearly(year_div)?;
+            self.year += i32::from(year_div);
+            checks::check_year_range(self.year)?;
         }
         Ok(())
     }

diff --git a/rrule/src/tests/rrule.rs b/rrule/src/tests/rrule.rs
@@ -1169,6 +1169,27 @@ fn monthly_by_nweekday_large() {
     );
 }
 
+#[test]
+fn issue_104() {
+    let rrule = RRule {
+        freq: Frequency::Monthly,
+        interval: 2,
+        count: Some(3),
+        by_weekday: vec![NWeekday::Nth(-1, Weekday::Mon)],
+        ..Default::default()
+    };
+    test_recurring_rrule(
+        rrule,
+        true,
+        ymd_hms(2023, 10, 30, 9, 0, 0),
+        &[
+            ymd_hms(2023, 10, 30, 9, 0, 0),
+            ymd_hms(2023, 12, 25, 9, 0, 0),
+            ymd_hms(2024, 2, 26, 9, 0, 0),
+        ],
+    );
+}
+
 #[test]
 fn monthly_by_month_and_weekday() {
     let rrule = RRule {