octets: fix slice_last() with non-zero offset #2291
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.
Summary
Fix
Octets::slice_last()andOctetsMut::slice_last()returning an incorrect tail slice when the internal offset has been advanced.These helpers previously used
cap()(remaining bytes afteroff) to compute the start index, but then applied that index to the full underlying buffer (self.buf[...]). Whenoff > 0, this could include already-consumed bytes and return the wrong region.Reproduction
Before this change, slice_last(4) could return the wrong region (e.g. starting at index 1), because cap() was treated as an absolute index into the full buffer.
Fix
Compute
endasself.buf.len()and sliceself.buf[end - len..end](and the mutable equivalent). The existinglen <= self.cap()guard ensuresend - len >= off, so the returned slice stays within the remaining window.Tests
Add regression cases that advance the offset via
get_bytes()and then assertslice_last()returns the correct tail bytes for bothOctetsandOctetsMut.Tested with: