From f322f4aa56469583d4d9189064ac165d7a0f6fad Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Thu, 22 May 2025 23:06:00 +0200
Subject: [PATCH] Fix leaks with multiple calls to DatePeriod iterator
 current()

Destroy the old value first. We can't skip recreating the value because
the object may have been changed in between calls.
---
 ext/date/php_date.c                           |  1 +
 ...le_calls_date_period_iterator_current.phpt | 42 +++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 ext/date/tests/multiple_calls_date_period_iterator_current.phpt

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 2347fd55706fa..910149efae658 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -1607,6 +1607,7 @@ static zval *date_period_it_current_data(zend_object_iterator *iter)
 	php_date_obj   *newdateobj;
 
 	/* Create new object */
+	zval_ptr_dtor(&iterator->current);
 	php_date_instantiate(get_base_date_class(object->start_ce), &iterator->current);
 	newdateobj = Z_PHPDATE_P(&iterator->current);
 	newdateobj->time = timelib_time_ctor();
diff --git a/ext/date/tests/multiple_calls_date_period_iterator_current.phpt b/ext/date/tests/multiple_calls_date_period_iterator_current.phpt
new file mode 100644
index 0000000000000..b0e90873e6126
--- /dev/null
+++ b/ext/date/tests/multiple_calls_date_period_iterator_current.phpt
@@ -0,0 +1,42 @@
+--TEST--
+Multiple calls to DatePeriod iterator current() leak objects
+--FILE--
+<?php
+$start = new DateTime('2018-12-31 00:00:00');
+$end   = new DateTime('2019-12-31 00:00:00');
+
+$interval = new DateInterval('P1M');
+$period = new DatePeriod($start, $interval, 1);
+
+$iter = $period->getIterator();
+var_dump($iter->current());
+var_dump($iter->current());
+$iter->current()->setTimestamp(0);
+var_dump($iter->current());
+
+?>
+--EXPECT--
+object(DateTime)#9 (3) {
+  ["date"]=>
+  string(26) "2018-12-31 00:00:00.000000"
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(3) "UTC"
+}
+object(DateTime)#9 (3) {
+  ["date"]=>
+  string(26) "2018-12-31 00:00:00.000000"
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(3) "UTC"
+}
+object(DateTime)#9 (3) {
+  ["date"]=>
+  string(26) "2018-12-31 00:00:00.000000"
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(3) "UTC"
+}