Skip to content

Fix GH-16258 overflow on jddayofweek argument. #16263

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

Fix GH-16258 overflow on jddayofweek argument. #16263

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35325ca
Fix GH-16258 overflow on jddayofweek argument.
devnexen Oct 6, 2024
81633ab
rework checks and re-establish old test value.
devnexen Oct 6, 2024
dcdf45d
changes from feedback
devnexen Oct 6, 2024
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
6 changes: 3 additions & 3 deletions ext/calendar/dow.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ int DayOfWeek(
{
int dow;

dow = (sdn + 1) % 7;
dow = (int)(sdn % 7 + 1);
if (dow >= 0) {
return (dow);
return (dow % 7);
} else {
return (dow + 7);
return (dow + 7) % 7;
}
Copy link
Member

Choose a reason for hiding this comment

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

Can't we just do:

return (sdn % 7 + 8) % 7;

instead of what we have now?

Copy link
Member Author

Choose a reason for hiding this comment

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

giving it a try

Copy link
Member

Choose a reason for hiding this comment

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

I mean, it is somewhat obscure, and likely not what @nielsdos had in mind. But I think it should work.

Copy link
Member Author

@devnexen devnexen Oct 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

it does work. I think the changed old test, the values make more sense to me.

Copy link
Member

Choose a reason for hiding this comment

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

Without that (int) cast, bug_53574_2.phpt succeeds for me; either remove the cast, or cast the whole return value to (int) (that shouldn't be necessary since the % 7 ensures that values fit into int, but if some tool complains, we may need to cast).

Copy link
Member

Choose a reason for hiding this comment

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

Double modulus works and is intuitive as well. It should be possible to avoid the double modulus too but it likely doesn't matter for performance.

}

Expand Down
12 changes: 12 additions & 0 deletions ext/calendar/tests/gh16258.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--TEST--
GH-16258 (jddayofweek overflow on argument)
--EXTENSIONS--
calendar
--FILE--
<?php
jddayofweek(PHP_INT_MAX, 1);
jddayofweek(PHP_INT_MIN, 1);
echo "DONE";
?>
--EXPECT--
DONE
Loading