Commit 02880158b5b for php.net
commit 02880158b5b4c685c4739dee80caa6f63baaa64b
Merge: 8680c3dd424 10704f079f6
Author: David Carlier <devnexen@gmail.com>
Date: Sat May 16 17:44:57 2026 +0100
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
ext/intl: Fix out-of-bounds argument positions in calendar date/time APIs.
diff --cc ext/intl/calendar/gregoriancalendar_methods.cpp
index 0cc3a94d4c5,0b36e621ef7..bf05cd8ad3f
--- a/ext/intl/calendar/gregoriancalendar_methods.cpp
+++ b/ext/intl/calendar/gregoriancalendar_methods.cpp
@@@ -174,9 -177,8 +174,9 @@@ static void _php_intlgregcal_constructo
}
} else {
// From date/time (3, 5 or 6 arguments)
+ GregorianCalendar *tmp;
for (int i = 0; i < variant; i++) {
- ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(largs[i], hasThis() ? (i-1) : i);
+ ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(largs[i], i + 1);
}
if (variant == 3) {