Skip to content

Fix #81500: Interval serialization regression since 7.3.14 / 7.4.2 #7575

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 4 commits into from
Closed

Fix #81500: Interval serialization regression since 7.3.14 / 7.4.2 #7575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
337deb1
Fix #81500: Interval serialization regression since 7.3.14 / 7.4.2
cmb69 Oct 13, 2021
9ec0085
Use zend_dval_to_lval() to take care of overflow
cmb69 Oct 15, 2021
da1ade8
fix another affected test case
cmb69 Oct 15, 2021
2b7c039
fix another test case
cmb69 Oct 15, 2021
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: 2 additions & 6 deletions ext/date/php_date.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4331,7 +4331,7 @@ static zval *date_interval_write_property(zval *object, zval *member, zval *valu
SET_VALUE_FROM_STRUCT(i, "i");
SET_VALUE_FROM_STRUCT(s, "s");
if (strcmp(Z_STRVAL_P(member), "f") == 0) {
obj->diff->us = zval_get_double(value) * 1000000;
obj->diff->us = zend_dval_to_lval(zval_get_double(value) * 1000000.0);
break;
}
SET_VALUE_FROM_STRUCT(invert, "invert");
Expand Down Expand Up @@ -4468,12 +4468,8 @@ static int php_date_interval_initialize_from_hash(zval **return_value, php_inter
PHP_DATE_INTERVAL_READ_PROPERTY("s", s, timelib_sll, -1)
{
zval *z_arg = zend_hash_str_find(myht, "f", sizeof("f") - 1);
(*intobj)->diff->us = -1000000;
if (z_arg) {
double val = zval_get_double(z_arg) * 1000000;
if (val >= 0 && val < 1000000) {
(*intobj)->diff->us = val;
}
(*intobj)->diff->us = zend_dval_to_lval(zval_get_double(z_arg) * 1000000.0);
}
}
PHP_DATE_INTERVAL_READ_PROPERTY("weekday", weekday, int, -1)
Expand Down
2 changes: 1 addition & 1 deletion ext/date/tests/bug53437_var3.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ object(DateInterval)#%d (16) {
["have_special_relative"]=>
int(0)
["f"]=>
float(-1)
float(0)
}
==DONE==
2 changes: 1 addition & 1 deletion ext/date/tests/bug53437_var5.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ object(DateInterval)#%d (16) {
["have_special_relative"]=>
int(0)
["f"]=>
float(-1)
float(0)
}
==DONE==
2 changes: 1 addition & 1 deletion ext/date/tests/bug73091.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ object(DateInterval)#%d (16) {
["s"]=>
int(-1)
["f"]=>
float(-1)
float(0)
["weekday"]=>
int(-1)
["weekday_behavior"]=>
Expand Down
2 changes: 1 addition & 1 deletion ext/date/tests/bug79015.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ object(DateInterval)#%d (16) {
["s"]=>
int(0)
["f"]=>
float(-1)
float(%f)
["weekday"]=>
int(0)
["weekday_behavior"]=>
Expand Down
16 changes: 16 additions & 0 deletions ext/date/tests/bug81500.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
--TEST--
Bug #81500 (Interval serialization regression since 7.3.14 / 7.4.2)
--FILE--
<?php
$interval = new DateInterval('PT1S');
$interval->f = -0.000001;
var_dump($interval->s, $interval->f);

$interval = unserialize(serialize($interval));
var_dump($interval->s, $interval->f);
?>
--EXPECT--
int(1)
float(-1.0E-6)
int(1)
float(-1.0E-6)
2 changes: 1 addition & 1 deletion ext/standard/tests/serialize/bug69425.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ array(2) {
["s"]=>
int(-1)
["f"]=>
float(-1)
float(0)
["weekday"]=>
int(-1)
["weekday_behavior"]=>
Expand Down