From 7b1a4e24008f34a76c343ece735953ad5124e09f Mon Sep 17 00:00:00 2001
From: Ignace Nyamagana Butera <nyamsprod@gmail.com>
Date: Mon, 25 Mar 2019 20:30:02 +0100
Subject: [PATCH] Fixed bug #77909: DatePeriod::__construct() with invalid
 recurrence count value

Improve error message on invalid reccurence count

Adding test when reccurence is -1
---
 NEWS                                          |  4 ++++
 ext/date/php_date.c                           |  4 ++++
 ...eriod_wrong_recurrence_on_constructor.phpt | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt

diff --git a/NEWS b/NEWS
index 4cb9b1ca5b6..89276908bb5 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,10 @@ PHP                                                                        NEWS
   . Fixed bug #77794 (Incorrect Date header format in built-in server).
     (kelunik)
 
+- Date:
+  . Fixed bug #77909 (DatePeriod::__construct() with invalid recurrence count
+    value). (Ignace Nyamagana Butera)
+
 - Interbase:
   . Fixed bug #72175 (Impossibility of creating multiple connections to
     Interbase with php 7.x). (Nikita)
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 9b37a9e3c18..f47ba5bc543 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -4645,6 +4645,10 @@ PHP_METHOD(DatePeriod, __construct)
 			dpobj->end = clone;
 		}
 	}
+ 
+	if (dpobj->end == NULL && recurrences < 1) {
+		php_error_docref(NULL, E_WARNING, "The recurrence count '%d' is invalid. Needs to be > 0", (int) recurrences);
+	}
 
 	/* options */
 	dpobj->include_start_date = !(options & PHP_DATE_PERIOD_EXCLUDE_START_DATE);
diff --git a/ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt b/ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt
new file mode 100644
index 00000000000..715ea63dc94
--- /dev/null
+++ b/ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt
@@ -0,0 +1,19 @@
+--TEST--
+DatePeriod: Test wrong recurrence parameter on __construct
+--FILE--
+<?php
+try {
+    new DatePeriod(new DateTime('yesterday'), new DateInterval('P1D'), 0);
+} catch (Exception $exception) {
+    echo $exception->getMessage(), "\n";
+}
+
+try {
+    new DatePeriod(new DateTime('yesterday'), new DateInterval('P1D'),-1);
+} catch (Exception $exception) {
+    echo $exception->getMessage(), "\n";
+}
+?>
+--EXPECTF--
+DatePeriod::__construct(): The recurrence count '0' is invalid. Needs to be > 0
+DatePeriod::__construct(): The recurrence count '-1' is invalid. Needs to be > 0