Check fixed args number for variadic function #4122
+50
−1
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
RalfJung
reviewed
Jan 7, 2025
| @@ -236,6 +237,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> { | |||
| "open" | "open64" => { | |||
| // `open` is variadic, the third argument is only present when the second argument has O_CREAT (or on linux O_TMPFILE, but miri doesn't support that) set | |||
| this.check_abi_and_shim_symbol_clash(abi, Conv::C , link_name)?; | |||
| this.check_fixed_args_count("open/open64", abi, 2)?; | |||
There was a problem hiding this comment.
Now it's still fairly easy to forget to call check_fixed_args_count.
So instead, please add a new this.check_shim_variadic that is a lot like check_shim but returns something like (&'a [OpTy<'tcx>; N], &'a [OpTy<'tcx>]) where the "fixed" arguments are mapped to the array and the variadic ones are returned in the slice.
When this is all done, check_abi_and_shim_symbol_clash should never be called in a shim; each shim should call check_shim or check_shim_variadic.
RalfJung
reviewed
Jan 7, 2025
| ) -> InterpResult<'tcx> { | ||
| if abi.fixed_count != expected_count { | ||
| throw_ub_format!( | ||
| "incorrect number of fixed args for `{name}`: got {}, expected {expected_count}", |
There was a problem hiding this comment.
Suggested change
| "incorrect number of fixed args for `{name}`: got {}, expected {expected_count}", | |
| "incorrect number of fixed arguments for variadic function `{name}`: got {}, expected {expected_count}", |
|
@rustbot author |
rustbot
added
S-waiting-on-author
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.
cc #4013
@rustbot ready