changes from feedback

Author: devnexen

ext/calendar/easter.c

@@ -28,6 +28,7 @@ static void _cal_easter(INTERNAL_FUNCTION_PARAMETERS, bool gm)
 	struct tm te;
 	zend_long year, golden, solar, lunar, pfm, dom, tmp, easter, result;
 	zend_long method = CAL_EASTER_DEFAULT;
+	const zend_long max_year = ZEND_LONG_MAX / 1.25;
 	bool year_is_null = 1;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(),
@@ -48,8 +49,8 @@ static void _cal_easter(INTERNAL_FUNCTION_PARAMETERS, bool gm)
 		}
 	}
 
-	if (year < 0 || year > (ZEND_LONG_MAX - 1)) {
-		zend_argument_value_error(1, "must be between 0 and " ZEND_LONG_FMT, (ZEND_LONG_MAX - 1));
+	if (year <= 0 || year > max_year) {
+		zend_argument_value_error(1, "must be between 1 and " ZEND_LONG_FMT, max_year);
 		RETURN_THROWS();
 	}
 

ext/calendar/tests/gh16228.phpt

@@ -21,6 +21,6 @@ try {
 }
 ?>
 --EXPECTF--
-easter_days(): Argument #1 ($year) must be between 0 and %d
-easter_days(): Argument #1 ($year) must be between 0 and %d
-easter_date(): Argument #1 ($year) must be between 0 and %d
+easter_days(): Argument #1 ($year) must be between 1 and %d
+easter_days(): Argument #1 ($year) must be between 1 and %d
+easter_date(): Argument #1 ($year) must be between 1 and %d