Skip to content

Fix leak on double DatePeriod::__construct() call #22643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
iluuu1994 wants to merge 1 commit into from
+33 −1
Closed

Fix leak on double DatePeriod::__construct() call #22643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion ext/date/php_date.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5206,6 +5206,23 @@ PHP_METHOD(DatePeriod, createFromISO8601String)
}
}

static void date_period_reset(php_period_obj *period_obj)
{
if (period_obj->start) {
timelib_time_dtor(period_obj->start);
}
if (period_obj->current) {
timelib_time_dtor(period_obj->current);
}
if (period_obj->end) {
timelib_time_dtor(period_obj->end);
}
if (period_obj->interval) {
timelib_rel_time_dtor(period_obj->interval);
}
memset(period_obj, 0, XtOffsetOf(php_period_obj, std));
Comment thread
iluuu1994 marked this conversation as resolved.
}

/* {{{ Creates new DatePeriod object. */
PHP_METHOD(DatePeriod, __construct)
{
Expand All @@ -5227,7 +5244,7 @@ PHP_METHOD(DatePeriod, __construct)
}

dpobj = Z_PHPPERIOD_P(ZEND_THIS);
dpobj->current = NULL;
date_period_reset(dpobj);

if (isostr) {
zend_error(E_DEPRECATED, "Calling DatePeriod::__construct(string $isostr, int $options = 0) is deprecated, "
Expand All @@ -5245,6 +5262,7 @@ PHP_METHOD(DatePeriod, __construct)
if (end) {
DATE_CHECK_INITIALIZED(Z_PHPDATE_P(end)->time, date_ce_interface);
}
DATE_CHECK_INITIALIZED(Z_PHPINTERVAL_P(interval)->initialized, Z_OBJCE_P(interval));

/* init */
php_interval_obj *intobj = Z_PHPINTERVAL_P(interval);
Expand Down
14 changes: 14 additions & 0 deletions ext/date/tests/DatePeriod_double_constructor_call.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--TEST--
Double DatePeriod::__construct() call
--FILE--
<?php

$start = new \DateTime();
$interval = new \DateInterval('P1D');
$period = new \DatePeriod($start, $interval, 1);
$period->__construct($start, $interval, 1);

?>
===DONE===
--EXPECT--
===DONE===
Loading