fix: return proper nil on runtime.InstantiateModule errors (#2353) #2354
+14
−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
edman
commented
Dec 25, 2024
| @@ -340,20 +339,20 @@ func (r *runtime) InstantiateModule( | |||
| if start == nil { | |||
| continue | |||
| } | |||
| if _, err = start.Call(ctx); err != nil { | |||
| if _, err := start.Call(ctx); err != nil { | |||
| _ = mod.Close(ctx) // Don't leak the module on error. | |||
There was a problem hiding this comment.
Unrelated to the bug I found, but is this correct?
It looks like this shouldn't be closed in the success case below in L347.
There was a problem hiding this comment.
I think if the module exited (even with exit code zero) it has already been closed. In that case, closing it again would not be an error.
…bs#2353) Previously InstantiateModule could return a (*wasm.ModuleInstance)(nil) instead of a proper nil value. So callers could get a nil dereference panic in code like: m, _ := r.InstantiateModule(...) if m != nil { // this check passes defer m.Close() // but this causes a panic } Signed-off-by: Edman Anjos <[email protected]>
|
This changes a lot more than the issue you had. If your issue was with line 318, why do you assume that returning the module and the error is not intentional when a start function "fails"? I'll defer to @mathetake but I could see someone wanting to (e.g.) inspect the linear memory of a module that called |
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.
Fixes #2353
Previously InstantiateModule could return a
(*wasm.ModuleInstance)(nil)instead of a propernilvalue.So callers could get a nil dereference panic in code like: