From 664fa5f08f51a0b46c314da919a2e0f1ef8b3905 Mon Sep 17 00:00:00 2001
From: Dianne Skoll <dianne@skoll.ca>
Date: Tue, 13 Apr 2021 12:21:37 -0400
Subject: [PATCH] Fix bug: Remind would sometimes compute incorrect trigger
 date for:

    REM 29 Feb SOME_WEEKDAY MSG ...
---
 src/trigger.c  | 1 +
 tests/test-rem | 4 ++++
 tests/test.cmp | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/src/trigger.c b/src/trigger.c
index 72b22837..1bdd6896 100644
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -221,6 +221,7 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 
 	/* Try this year */
 	y++;
+	while (trig->d > DaysInMonth(trig->m, y)) y++;
 	j = Julian(y, trig->m, trig->d);
         ADVANCE_TO_WD(j, trig->wd);
 	if (j >= startdate) return j;
diff --git a/tests/test-rem b/tests/test-rem
index ff866a1c..94c5032f 100644
--- a/tests/test-rem
+++ b/tests/test-rem
@@ -65,6 +65,10 @@ echo "" >> ../tests/test.out
 
 chmod 644 include_dir/04cantread.rem
 
+# Feb 29 bug
+echo "Feb 29 Bug Test" >> ../tests/test.out
+echo 'REM Sun 29 Feb MSG [$T]' | ../src/remind -dt - 1 feb 2021 >> ../tests/test.out 2>&1
+
 echo "Color Test" >> ../tests/test.out
 ../src/remind -ccl ../tests/colors.rem 1 aug 2007 >> ../tests/test.out 2>&1
 
diff --git a/tests/test.cmp b/tests/test.cmp
index 3d4e2e24..298ceaa0 100644
--- a/tests/test.cmp
+++ b/tests/test.cmp
@@ -4240,6 +4240,9 @@ September 30
 # fileinfo 5 ../tests/include_test.rem
 2007/08/15 * * * * Whee!!!!
 # rem2ps end
+Feb 29 Bug Test
+-(1): Trig = Sunday, 3 March, 2024
+No reminders.
 Color Test
 (0lqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqk(B
 (0x(B                                August 2007                                 (0x(B