Piper/convert malformed module error to be exception based #15
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
carver
approved these changes
Jan 16, 2019
wasm/__init__.py
Outdated
| len(F) > 1024 | ||
| ): # TODO: this is not part of spec, but this is required to pass tests. Tests pass with limit 10000, maybe more | ||
| return "exhaustion" | ||
| if (len(F) > 1024): |
There was a problem hiding this comment.
outer parens seem unnecessary
| return store, "error", e.args[0] | ||
| except Exception as err: | ||
| if err.args[0] in {"trap", "exhaustion", "invalid", "malformed"}: | ||
| raise Exception("Invariant: these exceptions should no longer be using the base exception class") from err |
wasm/__init__.py
Outdated
| externtypestar, extertypeprimestar = ret | ||
| importstar = module["imports"] | ||
| if len(importstar) != len(externtypestar): | ||
| return "error: wrong import length" | ||
| raise InvalidModule("invalid") |
There was a problem hiding this comment.
Lost a bit of info here: "wrong import length" could be the message for the InvalidModule message.
There was a problem hiding this comment.
Fixed, though funny enough, this code path isn't currently being excercised at all.
| @@ -62,13 +62,8 @@ def instantiate_module_from_wasm_file( | |||
| wasmbytes = memoryview(wasm_module_file.read()) | |||
| module = wasm.decode_module(wasmbytes) | |||
|
|
|||
| if module == "malformed": | |||
| raise MalformedModule(f"Malformed wasm module: {file_path.name}") | |||
There was a problem hiding this comment.
Including the file path that failed would probably be valuable, and the internal malformed exceptions don't have that. It might be worth catching and re-raising MalformedModule with that info.
| # validate | ||
| ret = wasm.validate_module(module) | ||
| if type(ret) == str and ret[:14] == "error: invalid": | ||
| raise InvalidModule(f"Invalid wasm module: {file_path.name}") |
There was a problem hiding this comment.
Same here (could re-raise with the file name)
pipermerriam
deleted the
piper/convert-malformed-module-error-to-be-exception-based
branch
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.
Builds on #14
What was wrong?
The invalid module error was magic string based.
How was it fixed?
Converted all invalid module errors to be exception based.
Cute Animal Picture