changes from feedback

Author: devnexen

ext/date/php_date.c

@@ -4743,6 +4743,8 @@ PHP_METHOD(DatePeriod, __construct)
 	dpobj = Z_PHPPERIOD_P(ZEND_THIS);
 	dpobj->current = NULL;
 
+	const zend_long max_recurrences = (INT_MAX - 8);
+
 	if (isostr) {
 		if (!date_period_initialize(&(dpobj->start), &(dpobj->end), &(dpobj->interval), &recurrences, isostr, isostr_len)) {
 			RETURN_THROWS();
@@ -4808,9 +4810,9 @@ PHP_METHOD(DatePeriod, __construct)
 		}
 	}
 
-	if (dpobj->end == NULL && (recurrences < 1 || ZEND_LONG_INT_OVFL(recurrences))) {
+	if (dpobj->end == NULL && (recurrences < 1 || recurrences > max_recurrences)) {
 		zend_string *func = get_active_function_or_method_name();
-		zend_throw_exception_ex(NULL, 0, "%s(): Recurrence count must be between 1 and %d", ZSTR_VAL(func), INT_MAX);
+		zend_throw_exception_ex(NULL, 0, "%s(): Recurrence count must be greater or equal to 1 and lower than " ZEND_LONG_FMT, ZSTR_VAL(func), max_recurrences + 1);
 		zend_string_release(func);
 		RETURN_THROWS();
 	}
@@ -4821,9 +4823,9 @@ PHP_METHOD(DatePeriod, __construct)
 
 	recurrences += dpobj->include_start_date + dpobj->include_end_date;
 
-	if (UNEXPECTED(ZEND_LONG_INT_OVFL(recurrences))) {
+	if (UNEXPECTED(recurrences > max_recurrences)) {
 		zend_string *func = get_active_function_or_method_name();
-		zend_throw_exception_ex(NULL, 0, "%s(): Recurrence count must be between 1 and %d (including options)", ZSTR_VAL(func), INT_MAX);
+		zend_throw_exception_ex(NULL, 0, "%s(): Recurrence count must be greater or equal to 1 and lower than " ZEND_LONG_FMT " (including options)", ZSTR_VAL(func), max_recurrences + 1);
 		zend_string_release(func);
 		RETURN_THROWS();
 	}

ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt

@@ -16,5 +16,5 @@ try {
 
 ?>
 --EXPECTF--
-DatePeriod::__construct(): Recurrence count must be between 1 and %d
-DatePeriod::__construct(): Recurrence count must be between 1 and %d
+DatePeriod::__construct(): Recurrence count must be greater or equal to 1 and lower than %d
+DatePeriod::__construct(): Recurrence count must be greater or equal to 1 and lower than %d

ext/date/tests/gh14709.phpt

@@ -10,17 +10,17 @@ $start = new DateTime('2018-12-31 00:00:00');
 $interval = new DateInterval('P1M');
 
 try {
-	new DatePeriod($start, $interval, PHP_INT_MAX);
+	new DatePeriod($start, $interval, 2147483640);
 } catch (Exception $e) {
 	echo $e->getMessage() . PHP_EOL;
 }
 
 try {
-	new DatePeriod($start, $interval, 2147483647, DatePeriod::EXCLUDE_START_DATE | DatePeriod::INCLUDE_END_DATE);
+	new DatePeriod($start, $interval, 2147483639, DatePeriod::EXCLUDE_START_DATE | DatePeriod::INCLUDE_END_DATE);
 } catch (Exception $e) {
 	echo $e->getMessage();
 }
 ?>
 --EXPECTF--
-DatePeriod::__construct(): Recurrence count must be between 1 and %d
-DatePeriod::__construct(): Recurrence count must be between 1 and %d (including options)
+DatePeriod::__construct(): Recurrence count must be greater or equal to 1 and lower than %d
+DatePeriod::__construct(): Recurrence count must be greater or equal to 1 and lower than %d (including options)