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 1 commit
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
4 changes: 4 additions & 0 deletions ext/calendar/dow.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ int DayOfWeek(
{
int dow;

if ((sdn + 1) > INT_MAX) {
Copy link
Member

Choose a reason for hiding this comment

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

zend_long can be the same as int; in which case this check is removed by the compiler because it'll be UB.
Note that you can just change the formula and the if-checks a bit because we're working in mod 7 to avoid the overflow; and avoid needing to check the overflow in the first place.

return (0);
}

dow = (sdn + 1) % 7;
if (dow >= 0) {
return (dow);
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/bug53574_2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ array(9) {
["year"]=>
int(0)
["dow"]=>
int(3)
int(0)
["abbrevdayname"]=>
string(3) "Wed"
["dayname"]=>
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(9223372036854775807, 1);
jddayofweek(-9223372036854775806, 1);
echo "DONE";
?>
--EXPECT--
DONE
Loading