php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 02:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #74639 - Added proper clone functionality for DatePeriod and DateInterval

Browse Source
This commit is contained in:
andrewnester
2017-05-26 13:56:41 +03:00
committed by Joe Watkins
parent 741769d933
commit 48598a2302
3 changed files with 57 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS
+4
View File
@@ -7,6 +7,10 @@ PHP NEWS
properties). (Laruence)
. Fixed misparsing of abstract unix domain socket names. (Sara)
- Date:
. Fixed bug #74639 (implement clone for DatePeriod and DateInterval).
(andrewnester)
- Mbstring:
. Add oniguruma upstream fix (CVE-2017-9224, CVE-2017-9226, CVE-2017-9227,
CVE-2017-9228, CVE-2017-9229) (Remi, Mamoru TASAKA)
ext/date/php_date.c
+20 -2
View File
@@ -2397,8 +2397,11 @@ static zend_object *date_object_clone_interval(zval *this_ptr) /* {{{ */
php_interval_obj *new_obj = php_interval_obj_from_obj(date_object_new_interval_ex(old_obj->std.ce, 0));
zend_objects_clone_members(&new_obj->std, &old_obj->std);
new_obj->initialized = old_obj->initialized;
if (old_obj->diff) {
new_obj->diff = timelib_rel_time_clone(old_obj->diff);
}
/** FIX ME ADD CLONE STUFF **/
return &new_obj->std;
} /* }}} */
@@ -2481,8 +2484,23 @@ static zend_object *date_object_clone_period(zval *this_ptr) /* {{{ */
php_period_obj *new_obj = php_period_obj_from_obj(date_object_new_period_ex(old_obj->std.ce, 0));
zend_objects_clone_members(&new_obj->std, &old_obj->std);
new_obj->initialized = old_obj->initialized;
new_obj->recurrences = old_obj->recurrences;
new_obj->include_start_date = old_obj->include_start_date;
new_obj->start_ce = old_obj->start_ce;
/** FIX ME ADD CLONE STUFF **/
if (old_obj->start) {
new_obj->start = timelib_time_clone(old_obj->start);
}
if (old_obj->current) {
new_obj->current = timelib_time_clone(old_obj->current);
}
if (old_obj->end) {
new_obj->end = timelib_time_clone(old_obj->end);
}
if (old_obj->interval) {
new_obj->interval = timelib_rel_time_clone(old_obj->interval);
}
return &new_obj->std;
} /* }}} */
ext/date/tests/bug74639.phpt
+33
View File
@@ -0,0 +1,33 @@
--TEST--
Bug #74639 Cloning DatePeriod leads to segfault
--FILE--
<?php
$start = new DateTime('2017-05-22 09:00:00');
$end = new DateTime('2017-08-24 18:00:00');
$interval = $start->diff($end);
$period = new DatePeriod($start, $interval, $end);
$clonedPeriod = clone $period;
$clonedInterval = clone $interval;
if ($period->getStartDate() != $clonedPeriod->getStartDate()) {
echo "failure\n";
}
if ($period->getEndDate() != $clonedPeriod->getEndDate()) {
echo "failure\n";
}
if ($period->getDateInterval() != $clonedPeriod->getDateInterval()) {
echo "failure\n";
}
if ($interval->format('Y-m-d H:i:s') != $clonedInterval->format('Y-m-d H:i:s')) {
echo "failure\n";
}
echo 'success';
?>
--EXPECT--
success