fix(bytecode): preserve iterator position after truncated push#3800
Open
pengqima wants to merge 1 commit into
Open
fix(bytecode): preserve iterator position after truncated push#3800pengqima wants to merge 1 commit into
pengqima wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Make
BytecodeIterator::skip_immediateconsume at most the bytes that remain, keeping an exhausted iterator anchored to the original bytecode slice.This is a follow-up to #3792.
Problem
After #3792 switched
BytecodeIteratorto the original unpadded legacy bytecode, a truncatedPUSHcan makeget(immediate_size..)returnNone.The previous
unwrap_or_default()fallback then creates an empty slice unrelated to the original bytecode allocation. A later call toposition()usesoffset_from_unsignedrelative to the original start pointer, which requires both pointers to belong to the same allocation.Fix
Slice at
min(immediate_size, remaining.len())instead. This preserves the existing iteration behavior—all available immediate bytes are consumed and iteration ends—while retaining the original slice provenance.A regression test covers calling
position()after a partially truncatedPUSH2.Testing
cargo fmt --all --checkcargo test -p revm-bytecode --all-featurescargo clippy -p revm-bytecode --all-targets --all-features -- -D warningscargo check -p revm-bytecode --no-default-features