Replace InvalidDeposit and InvalidOpcode exceptions with asserts
#15596
Conversation
This file contains 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
- We never actually catch it so it's already de facto handled like a failed assert, just with worse diagnostics.
- The only case where it needs to be an exception is assembly import. In other situations we don't catch it so it's effectively an assert.
cameel
commented
Nov 29, 2024
| @@ -267,28 +268,28 @@ inline unsigned getLogNumber(Instruction _inst) | |||
| /// @returns the PUSH<_number> instruction | |||
| inline Instruction pushInstruction(unsigned _number) | |||
| { | |||
| assertThrow(_number <= 32, InvalidOpcode, std::string("Invalid PUSH instruction requested (") + std::to_string(_number) + ")."); | |||
| solAssert(_number <= 32); | |||
There was a problem hiding this comment.
Note that this validation was impossible to trigger via assembly import, because the import blindly converts the value to u256 without checking the range. The conversion silently truncates the value to 256 bits so it can never exceed 32 bytes. This means that this case is not validated at all.
This is actually a bug in assembly import - out-of-range PUSH values result in something wrong being pushed to the stack.
This was referenced Nov 29, 2024
matheusaaguiar
approved these changes
Nov 29, 2024
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.
A bit of simplification of our error handling in bytecode generation. We have dedicated exceptions defined for some cases but they're almost never caught and are de facto equivalent with failed assertions. The only case where we catch one of them is assembly import.
The PR replaces them with proper asserts (and
AssemblyImportExceptionin the one case where we do catch them).