-
Notifications
You must be signed in to change notification settings - Fork 12.4k
Check that slice are in the reserved space in Accumulator push and shift #6302
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.
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
Open
Amxx
wants to merge
3
commits into
OpenZeppelin:master
Choose a base branch
from
Amxx:check-slice-validity-in-Accumulator
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+61
−3
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| 'openzeppelin-solidity': minor | ||
| --- | ||
|
|
||
| `Memory`: Add a `isReserved(Slice)` function. |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| 'openzeppelin-solidity': minor | ||
| --- | ||
|
|
||
| `Accumulator`: Check that slices being added (shift or push) are in the reserved space. |
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
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
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
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -22,18 +22,52 @@ contract MemoryTest is Test { | |||||||
| } | ||||||||
|
|
||||||||
| function testAsSliceToBytes(bytes memory input) public pure { | ||||||||
| assertEq(input.asSlice().toBytes(), input); | ||||||||
| Memory.Slice slice = input.asSlice(); | ||||||||
| assertEq(slice.toBytes(), input); | ||||||||
| assertTrue(slice.isReserved()); | ||||||||
| } | ||||||||
|
|
||||||||
| function testSlice(bytes memory input, uint256 offset) public pure { | ||||||||
| offset = bound(offset, 0, input.length); | ||||||||
| assertEq(input.asSlice().slice(offset).toBytes(), input.slice(offset)); | ||||||||
|
|
||||||||
| Memory.Slice slice = input.asSlice().slice(offset); | ||||||||
| assertEq(slice.toBytes(), input.slice(offset)); | ||||||||
| assertTrue(slice.isReserved()); | ||||||||
| } | ||||||||
|
|
||||||||
| function testSlice(bytes memory input, uint256 offset, uint256 length) public pure { | ||||||||
| offset = bound(offset, 0, input.length); | ||||||||
| length = bound(length, 0, input.length - offset); | ||||||||
| assertEq(input.asSlice().slice(offset, length).toBytes(), input.slice(offset, offset + length)); | ||||||||
|
|
||||||||
| Memory.Slice slice = input.asSlice().slice(offset, length); | ||||||||
| assertEq(slice.toBytes(), input.slice(offset, offset + length)); | ||||||||
| assertTrue(slice.isReserved()); | ||||||||
| } | ||||||||
|
|
||||||||
| function testInvalidSlice1() public pure { | ||||||||
| bytes memory input = new bytes(256); | ||||||||
| Memory.Slice slice = input.asSlice(); | ||||||||
|
|
||||||||
| assertTrue(slice.isReserved()); | ||||||||
|
|
||||||||
| assembly ("memory-safe") { | ||||||||
| slice := add(slice, 0x01) // add 1 to the ptr part | ||||||||
| } | ||||||||
|
|
||||||||
| assertFalse(slice.isReserved()); | ||||||||
| } | ||||||||
|
|
||||||||
| function testInvalidSlice2() public pure { | ||||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
| bytes memory input = new bytes(256); | ||||||||
|
Comment on lines
+60
to
+61
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
| Memory.Slice slice = input.asSlice(); | ||||||||
|
|
||||||||
| assertTrue(slice.isReserved()); | ||||||||
|
|
||||||||
| assembly ("memory-safe") { | ||||||||
| slice := add(slice, shl(128, 0x01)) // add 1 to the length part | ||||||||
| } | ||||||||
|
|
||||||||
| assertFalse(slice.isReserved()); | ||||||||
| } | ||||||||
|
|
||||||||
| function testSymbolicEqual(bytes memory a, bytes memory b) public pure { | ||||||||
|
|
||||||||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It will not work. For input objects that have a length that are not a multiple of 32, solidity will set the FMP to a multiple of 32. This means adding 1 is not enough to guarantee the error (because there is more reserved memory than strictly needed)