inflate/bitreader: fix unsoundness in advance() #242
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
BitReader::advance()
is unsound: ifbytes
is too large, we invoke UB inself.ptr.add(bytes)
by advancing the pointer out of bounds of the allocated area. This doesn't happen in practice, since all uses ofadvance()
are bounds checking withBitReader::bytes_available()
, but we can make this API safer.Use
.wrapping_add()
instead, which is safe for all inputs. The docs for it claim that.add()
opens up more optimization opportunities. However, the generated assembly on x86_64 and aarch64 in release mode appear to be exactly the same, so I don't think we're losing out on anything here. (The guaranteed zero-cost way to fix this would be to just makeadvance()
unsafe and document the invariant).