Fixes a panic in the wasm executor when entrypoint is not known #3779
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
|
Important Auto Review SkippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the To trigger a single review, invoke the TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (invoked as PR comments)
Additionally, you can add CodeRabbit Configration File (
|
frrist
approved these changes
Apr 11, 2024
pkg/executor/wasm/handler.go
Outdated
Comment on lines
67
to
73
| if r := recover(); r != nil { | ||
| h.logger.Error(). | ||
| Str("recover", fmt.Sprintf("%v", r)). | ||
| Msg("execution recovered from panic") | ||
| // TODO don't do this. | ||
| h.result = &models.RunCommandResult{} | ||
| } |
There was a problem hiding this comment.
If we are 100% sure the code called below here won't panic then I am for removing this defer statement, otherwise I'd find it safer to leave it here.
There was a problem hiding this comment.
If we leave it, then I'd suggest we change it to returning an error instead as at the moment it makes it look like the execution succeeded.
There was a problem hiding this comment.
That sounds good to me. Basically do what was done here:
h.result = executor.NewFailedResult(
fmt.Sprintf("unable to find the entrypoint '%s' in the WASM module", h.arguments.EntryPoint),
)
return
but change the error message to state a panic occurred?
Currently we try to reference the `ExportedFunction` which is documented as returning nil when the name is not found. Instead it returns a non-nil object with an inner nil field which will cause a panic when `Call`-ed. This commit instead looks up the function before referencing it to ensure it exists, returning an error early if not. This allows us to remove the call to recover which was handling the panic() for us.
rossjones
force-pushed
the
3753-fix-wasm-panic
branch
from
3fc381a
to
3c8736e
Compare
simonwo
approved these changes
Apr 12, 2024
aronchick
pushed a commit
that referenced
this pull request
Apr 27, 2024
Currently we try to reference the `ExportedFunction` which is documented as returning nil when the name is not found. Instead it returns a non-nil object with an inner nil field which will cause a panic when `Call`-ed. This commit instead looks up the function before referencing it to ensure it exists, returning an error early if not. This allows us to remove the call to recover which was handling the panic() for us. Fixes #3753
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.
Currently we try to reference the
ExportedFunctionwhich is documented as returning nil when the name is not found. Instead it returns a non-nil object with an inner nil field which will cause a panic whenCall-ed.This commit instead looks up the function before referencing it to ensure it exists, returning an error early if not. This allows us to remove the call to recover which was handling the panic() for us.
Fixes #3753