Void codemethod call should not crash #4850
Merged
Conversation
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
powercode
requested review from
BrucePay,
daxian-dbw,
lzybkr and
vors
as code owners
lzybkr
suggested changes
Sep 17, 2017
Contributor
lzybkr
left a comment
lzybkr
left a comment
There was a problem hiding this comment.
Just one small change and I think it's good.
| Expression expr = InvokeMethod(codeMethod.CodeReference, null, args.Prepend(target).ToArray(), false, MethodInvocationType.Ordinary); | ||
| if (codeMethod.CodeReference.ReturnType == typeof(void)) | ||
| { | ||
| expr = Expression.Block(expr, Expression.Default(typeof(object))); |
Contributor
There was a problem hiding this comment.
This should be:
expr = Expression.Block(expr, ExpressionCache.AutomationNullConstant);Otherwise it might be possible to use the return value.
lzybkr
approved these changes
Sep 18, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 #4826
Adding a check if the method to be called is void, and in that case wrap it in a block that returns null.
Looking at some other code, there seems to be a
CSharpBinderFlags.ResultDiscardedwhen they to this in C#. Can reviewers please check if this or something similar needs to be used here?