Fix #67976: cal_days_month() fails for final month of the French calendar

The French calendar ends on 0014-13-05, so trying to calculate the Julian
day of 0015-01-01 fails. We cater to that by returning the hard-coded value.

diff --git a/NEWS b/NEWS
index b03e691a3395ec4d91af626b95c9fec806ac170d..98e9d420285811ec179cf7b4c355d561e877cf25 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,10 @@ PHP                                                                        NEWS
   . Fixed bug #72641 (phpize (on Windows) ignores PHP_PREFIX).
     (Yuji Uchiyama)
 
+- Calendar:
+  . Fixed bug #67976 (cal_days_month() fails for final month of the French
+    calendar). (cmb)
+
 - Curl:
   . Fixed bug #71144 (Segmentation fault when using cURL with ZTS).
     (maroszek at gmx dot net)

diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c
index 74478e8b9332774cef487dfb51fafa63b7e5226f..1f92b9f2e058fe48bbf2b65aadd2edff429c487d 100644 (file)
--- a/ext/calendar/calendar.c
+++ b/ext/calendar/calendar.c
@@ -359,6 +359,10 @@ PHP_FUNCTION(cal_days_in_month)
                }
                else {
                        sdn_next = calendar->to_jd(year + 1, 1, 1);
+                       if (cal == CAL_FRENCH && sdn_next == 0) {
+                               /* The French calendar ends on 0014-13-05. */
+                               sdn_next = 2380953;
+                       }
                }
        }
 

diff --git a/ext/calendar/tests/bug67976.phpt b/ext/calendar/tests/bug67976.phpt
new file mode 100644 (file)
index 0000000..74e0bc8
--- /dev/null
+++ b/ext/calendar/tests/bug67976.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Bug #67976 (cal_days_month() fails for final month of the French calendar)
+--SKIPIF--
+<?php
+if (!extension_loaded('calendar')) die('skip ext/calendar required');
+?>
+--FILE--
+<?php
+var_dump(cal_days_in_month(CAL_FRENCH, 13, 14));
+?>
+--EXPECT--
+int(5)