Skip to content
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

Jump to bottom

Fix GH-#18051 (DateTimeZone->getTransitions can return first transition twice) #18054

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix GH-#18051 (DateTimeZone->getTransitions can return first transition twice) #18054

wants to merge 2 commits into from
+111 −6

Conversation

marc-mabe
Copy link
Contributor

This PR fixes duplicated transitions in DateTimeZone->getTransitions() by memorizing the last transition timestamp reported before the next transition gets added to the resulting array.

@marc-mabe marc-mabe requested a review from derickr as a code owner March 13, 2025 21:07
derickr
derickr reviewed Mar 28, 2025
View reviewed changes
Copy link
Member

@derickr derickr left a comment

Choose a reason for hiding this comment

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

LGTM, but with a comment to address first.

ext/date/php_date.c Outdated
add_assoc_bool(&element, "isdst", tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].isdst); \
add_assoc_string(&element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].abbr_idx]); \
add_next_index_zval(return_value, &element);
if (timestamp_added_last != ts) { \
Copy link
Member

Choose a reason for hiding this comment

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

Wouldn't it make more apparent why this is done, by using:

if (ts > timestamp_added_last) {  \

They should always be sequential.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

while I don't see where it makes it in any way more apparent I also don't see an issue with it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated

ext/date/php_date.c Outdated
add_assoc_bool(&element, "isdst", tzobj->tzi.tz->type[i].isdst); \
add_assoc_string(&element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[i].abbr_idx]); \
add_next_index_zval(return_value, &element);
if (timestamp_added_last != ts) { \
Copy link
Member

Choose a reason for hiding this comment

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

DItto

ext/date/php_date.c Outdated
add_assoc_bool(&element, "isdst", (to)->is_dst); \
add_assoc_string(&element, "abbr", (to)->abbr); \
add_next_index_zval(return_value, &element);
if (timestamp_added_last != ts) { \
Copy link
Member

Choose a reason for hiding this comment

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

And here too.

@marc-mabe marc-mabe force-pushed the fix/DateTimeZone-getTransitions-gh18051 branch from c3df98b to 18350af Compare March 31, 2025 07:19
@marc-mabe
Copy link
Contributor Author

@derickr It turns out that the transitions are not sequential in all cases - at least not on 32bit.
On digging deeper into the failed test case of bug 80963 I get the following on master:

var_dump(array_slice(new DateTimeZone("America/New_York")->getTransitions(), 0, 3));
array(3) {
  [0]=>
  array(5) {
    ["ts"]=>
    int(-2147483648)
    ["time"]=>
    string(25) "1901-12-13T20:45:52+00:00"
    ["offset"]=>
    int(-17762)
    ["isdst"]=>
    bool(false)
    ["abbr"]=>
    string(3) "LMT"
  }
  [1]=>
  array(5) {
    ["ts"]=>
    int(1577316496)
    ["time"]=>
    string(25) "2019-12-25T23:28:16+00:00"
    ["offset"]=>
    int(-18000)
    ["isdst"]=>
    bool(false)
    ["abbr"]=>
    string(3) "EST"
  }
  [2]=>
  array(5) {
    ["ts"]=>
    int(-1633280400)
    ["time"]=>
    string(25) "1918-03-31T07:00:00+00:00"
    ["offset"]=>
    int(-14400)
    ["isdst"]=>
    bool(true)
    ["abbr"]=>
    string(3) "EDT"
  }
}

@marc-mabe
Copy link
Contributor Author

@derickr Using a different approach now to avoid one variable and some assignments / comparisons.
It also fixes an integer overflow on 32bit at if (tzobj->tzi.tz->trans[i] < timestamp_end) { add(i, tzobj->tzi.tz->trans[i]); } and updated the test for bug 80963.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@derickr derickr derickr left review comments

Assignees
No one assigned
Labels
Extension: date
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@marc-mabe @derickr