Skip to content

Fix oss-fuzz report triggered by GH-15712 commit. #15915

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 oss-fuzz report triggered by GH-15712 commit. #15915

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fce3d4f
Fix oss-fuzz report triggered by GH-15712 commit.
devnexen Sep 16, 2024
21b9ab3
changes from feedback
devnexen Nov 7, 2024
620d641
changes from feedback
devnexen Nov 7, 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
15 changes: 12 additions & 3 deletions Zend/zend_strtod.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3613,13 +3613,22 @@ rv_alloc(i) int i;
rv_alloc(int i)
#endif
{

int k, *r;
size_t j, rem;

rem = sizeof(Bigint) - sizeof(ULong) - sizeof(int);

size_t j = sizeof(ULong);

j = sizeof(ULong);
if (i > (INT_MAX - rem))
Copy link
Member

Choose a reason for hiding this comment

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

I think this line should be

Suggested change
if (i > (INT_MAX - rem))
if (i > ((INT_MAX >> 2) + rem))

Then the other overflow check should be superfluous.

Copy link
Member

Choose a reason for hiding this comment

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

Oh, and I think reverting the changes from #15715 could also be appropriate, since j should never exceed INT_MAX (actually, it must always be less than 0x40000000).

zend_error_noreturn(E_ERROR, "rv_alloc() allocation overflow %d", i);
for(k = 0;
sizeof(Bigint) - sizeof(ULong) - sizeof(int) + j <= (size_t)i;
j <<= 1)
j <= (INT_MAX >> 1) && rem + j <= (size_t)i; j <<= 1)
k++;
if (j > (INT_MAX >> 1))
zend_error_noreturn(E_ERROR, "rv_alloc() computation overflow " ZEND_LONG_FMT, j);

r = (int*)Balloc(k);
*r = k;
return
Expand Down
Loading