Skip to content

Fix #70153 \DateInterval incorrectly unserialized #4687

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
wants to merge 5 commits into from
Closed

Fix #70153 \DateInterval incorrectly unserialized #4687

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
adae5c1
Fix #70153 \DateInterval incorrectly unserialized
Sep 6, 2019
ab9f351
Fix #70153 \DateInterval incorrectly unserialized
iakunin Sep 6, 2019
0cd51d6
Fix #70153 \DateInterval incorrectly unserialized
Sep 8, 2019
3f378ea
Fix #70153 \DateInterval incorrectly unserialized
Sep 9, 2019
e850ba4
Fix #70153 \DateInterval incorrectly unserialized
iakunin Sep 16, 2019
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
8 changes: 6 additions & 2 deletions ext/date/php_date.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4357,7 +4357,11 @@ static int php_date_interval_initialize_from_hash(zval **return_value, php_inter
zval *z_arg = zend_hash_str_find(myht, element, sizeof(element) - 1); \
if (z_arg && Z_TYPE_P(z_arg) <= IS_STRING) { \
zend_string *str = zval_get_string(z_arg); \
DATE_A64I((*intobj)->diff->member, ZSTR_VAL(str)); \
if (str->len) { \
DATE_A64I((*intobj)->diff->member, ZSTR_VAL(str)); \
} else { \
(*intobj)->diff->member = -99999; \
} \
Copy link
Member

@nikic nikic Sep 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would make more sense to treat days separately, rather than trying to fit it into this macro (and thus giving all other properties the same behavior, even though it doesn't make sense there).

We could then also explicitly check for a false value, rather than "" === (string)false, as what is done now.

Copy link
Author

@iakunin iakunin Sep 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've created a separate macro for handling days property.

But I'm not sure if it's the best way to solve this problem.

zend_string_release(str); \
} else { \
(*intobj)->diff->member = -1LL; \
Expand Down Expand Up @@ -4661,7 +4665,7 @@ 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);
}
Expand Down
2 changes: 1 addition & 1 deletion ext/date/tests/bug48678.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ DateInterval Object
[weekday_behavior] => 0
[first_last_day_of] => 0
[invert] => 0
[days] => 0
[days] =>
[special_type] => 0
[special_amount] => 0
[have_weekday_relative] => 0
Expand Down
2 changes: 1 addition & 1 deletion ext/date/tests/bug53437.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ object(DatePeriod)#5 (6) {
["invert"]=>
int(0)
["days"]=>
int(0)
bool(false)
["special_type"]=>
int(0)
["special_amount"]=>
Expand Down
2 changes: 1 addition & 1 deletion ext/date/tests/bug53437_var2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ object(DateInterval)#2 (16) {
["invert"]=>
int(0)
["days"]=>
int(0)
bool(false)
["special_type"]=>
int(0)
["special_amount"]=>
Expand Down
14 changes: 14 additions & 0 deletions ext/date/tests/bug70153.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--TEST--
Bug #70153 (\DateInterval incorrectly unserialized)
--FILE--
<?php
$i1 = \DateInterval::createFromDateString('+1 month');
$i2 = unserialize(serialize($i1));
var_dump($i1->days, $i2->days);
var_dump($i2->special_amount, $i2->special_amount);
?>
--EXPECT--
bool(false)
bool(false)
int(0)
int(0)