-
Notifications
You must be signed in to change notification settings - Fork 13.4k
GetUserProfileDirectoryW is now documented to always store the size #141405
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
The Miri subtree was changed cc @rust-lang/miri |
@@ -230,16 +230,16 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> { | |||
interp_ok(match directories::UserDirs::new() { | |||
Some(dirs) => { | |||
let home = dirs.home_dir(); | |||
let size_avail = if this.ptr_is_null(size.ptr())? { | |||
let size_avail = if this.ptr_is_null(buf)? { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The comment already talked about checking buf
, not size
... and we unconditionally write size
so it being null already triggered UB before.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Makes sense to me - docs agree that lpcchSize is required:
https://learn.microsoft.com/en-us/windows/win32/api/userenv/nf-userenv-getuserprofiledirectoryw
_In_ HANDLE hToken,
_Out_writes_opt_(*lpcchSize) LPWSTR lpProfileDir,
_Inout_ LPDWORD lpcchSize
(There's no Opt suffix to denote that nullptr is an allowed value for lpcchSize)
Great work as always :)
Great, thanks! @bors r+ rollup |
Rollup of 7 pull requests Successful merges: - #138896 (std: fix aliasing bug in UNIX process implementation) - #140832 (aarch64-linux: Default to FramePointer::NonLeaf) - #141065 (Updated std doctests for wasm) - #141369 (Simplify `format_integer_with_underscore_sep`) - #141374 (make shared_helpers exe function work for both cygwin and non-cygwin hosts) - #141398 (chore: fix typos in comment) - #141457 (Update mdbook to 0.4.50) Failed merges: - #141405 (GetUserProfileDirectoryW is now documented to always store the size) r? `@ghost` `@rustbot` modify labels: rollup
☔ The latest upstream changes (presumably #141437) made this pull request unmergeable. Please resolve the merge conflicts. |
9818410
to
587653a
Compare
@bors r=ChrisDenton |
… r=ChrisDenton GetUserProfileDirectoryW is now documented to always store the size Update to match MicrosoftDocs/sdk-api#1810 Also fix a bug in the Miri implementation while I am starting at that code... r? `@ChrisDenton` Fixes rust-lang#141254
Rollup of 8 pull requests Successful merges: - #140790 (Enable xray support for Mac) - #141405 (GetUserProfileDirectoryW is now documented to always store the size) - #141413 (Make #[cfg(version)] respect RUSTC_OVERRIDE_VERSION_STRING) - #141427 (Disable `triagebot`'s `glacier` handler) - #141429 (Dont walk into unsafe binders when emiting error for non-structural type match) - #141438 (Do not try to confirm non-dyn compatible method) - #141444 (Improve CONTRIBUTING.md grammar and clarity) - #141446 (Add 2nd Solaris target maintainer) r? `@ghost` `@rustbot` modify labels: rollup
… r=ChrisDenton GetUserProfileDirectoryW is now documented to always store the size Update to match MicrosoftDocs/sdk-api#1810 Also fix a bug in the Miri implementation while I am starting at that code... r? ``@ChrisDenton`` Fixes rust-lang#141254
Rollup of 7 pull requests Successful merges: - #141405 (GetUserProfileDirectoryW is now documented to always store the size) - #141427 (Disable `triagebot`'s `glacier` handler) - #141429 (Dont walk into unsafe binders when emiting error for non-structural type match) - #141438 (Do not try to confirm non-dyn compatible method) - #141444 (Improve CONTRIBUTING.md grammar and clarity) - #141446 (Add 2nd Solaris target maintainer) - #141456 (Suggest correct `version("..")` predicate syntax in check-cfg) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of #141405 - RalfJung:GetUserProfileDirectoryW, r=ChrisDenton GetUserProfileDirectoryW is now documented to always store the size Update to match MicrosoftDocs/sdk-api#1810 Also fix a bug in the Miri implementation while I am starting at that code... r? ```@ChrisDenton``` Fixes #141254
Update to match MicrosoftDocs/sdk-api#1810
Also fix a bug in the Miri implementation while I am starting at that code...
r? @ChrisDenton
Fixes #141254