Skip to content

Fix for integer overflow in BinaryHeap for ZSTs#149451

Open
Saphereye wants to merge 1 commit intorust-lang:mainfrom
Saphereye:binary_heap_integer_overflow
Open

Fix for integer overflow in BinaryHeap for ZSTs#149451
Saphereye wants to merge 1 commit intorust-lang:mainfrom
Saphereye:binary_heap_integer_overflow

Conversation

@Saphereye
Copy link
Copy Markdown

@Saphereye Saphereye commented Nov 29, 2025 •
edited by rustbot
Loading

Fixes #149448

This PR fixes a potential integer overflow while calculating the children of a node for a BinaryHeap for zero sized types.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Nov 29, 2025
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Nov 29, 2025

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

quaternic
quaternic reviewed Nov 29, 2025
View reviewed changes
Comment thread library/alloc/src/collections/binary_heap/mod.rs Outdated
@rust-log-analyzer

This comment has been minimized.

Sign in to view
quaternic
quaternic reviewed Nov 30, 2025
View reviewed changes
Comment thread library/alloc/src/collections/binary_heap/mod.rs Outdated
quaternic
quaternic reviewed Nov 30, 2025
View reviewed changes
Comment thread library/alloc/src/collections/binary_heap/mod.rs Outdated
quaternic
quaternic reviewed Nov 30, 2025
View reviewed changes
Comment thread library/alloc/src/collections/binary_heap/mod.rs Outdated
quaternic
quaternic reviewed Nov 30, 2025
View reviewed changes
Comment thread library/alloc/src/collections/binary_heap/mod.rs Outdated
quaternic
quaternic reviewed Nov 30, 2025
View reviewed changes
Comment thread library/alloc/src/collections/binary_heap/mod.rs Outdated
quaternic
quaternic reviewed Nov 30, 2025
View reviewed changes
Comment thread library/alloc/src/collections/binary_heap/mod.rs Outdated
quaternic
quaternic reviewed Dec 1, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@quaternic quaternic left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

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

I left some suggestions rephrasing comments, but with that this is looking good.

If you could then squash the commits, I think it will be ready to go.

View changes since this review

Comment thread library/alloc/src/collections/binary_heap/mod.rs Outdated
Comment thread library/alloc/src/collections/binary_heap/mod.rs Outdated
Comment thread library/alloc/src/collections/binary_heap/mod.rs Outdated
Comment thread library/alloc/src/collections/binary_heap/mod.rs Outdated
Comment thread library/alloc/src/collections/binary_heap/mod.rs Outdated
@Saphereye Saphereye force-pushed the binary_heap_integer_overflow branch from 66c47bb to 0edddd2 Compare December 1, 2025 13:40
@rustbot rustbot assigned Saphereye and unassigned Mark-Simulacrum Dec 4, 2025
@Saphereye Saphereye removed their assignment Dec 4, 2025
@Mark-Simulacrum
Copy link
Copy Markdown
Member

Mark-Simulacrum commented Dec 28, 2025

Can we add test(s) to exercise this code with a BinaryHeap of ZSTs? I think the code changes look reasonable enough.

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 28, 2025
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Dec 28, 2025

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@Dylan-DPC
Copy link
Copy Markdown
Member

Dylan-DPC commented Apr 28, 2026

@Saphereye any updates on this? thanks

@Saphereye
Copy link
Copy Markdown
Author

Saphereye commented May 5, 2026

Hi, sorry for the delay.
I couldn't come up with a test to successfully trigger this case. LLVM optimizes away heap operations on ZSTs entirely so I am stuck on how I can trigger this.

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

Reviewers

1 more reviewer

@quaternic quaternic quaternic left review comments

Reviewers whose approvals may not affect merge requirements

At least 1 approving review is required to merge this pull request.

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

BinaryHeap integer overflow with ZST?

6 participants

@Saphereye @rustbot @rust-log-analyzer @Mark-Simulacrum @Dylan-DPC @quaternic