Windows: Fix Command::env_clear so it works if no variables are set#86467
Merged
bors merged 2 commits intorust-lang:masterfrom Jun 24, 2021
Merged
Windows: Fix Command::env_clear so it works if no variables are set#86467bors merged 2 commits intorust-lang:masterfrom
Command::env_clear so it works if no variables are set#86467bors merged 2 commits intorust-lang:masterfrom
Conversation
Previously, it would error unless at least one new environment variable was added.
Contributor
|
r? @m-ou-se (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Member
|
Looks reasonable to me, could you add a test to https://github.com/rust-lang/rust/blob/master/library/std/src/process/tests.rs? |
Member
Author
|
Ok, I've added a test and confirmed it fails without this patch and succeeds with it. |
JohnTitor
approved these changes
Jun 24, 2021
Member
|
LGTM and confirmed that it worked well on my local, thanks! r? @JohnTitor @bors r+ |
Collaborator
|
📌 Commit 16145a9 has been approved by |
bors
added
S-waiting-on-bors
Collaborator
Collaborator
|
☀️ Test successful - checks-actions |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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.
Previously, it would error unless at least one new environment variable was added. The missing null presumably meant that Windows was reading random memory in that case.
See: CreateProcessW (scroll down to
lpEnvironment). Essentially the environment block is a null terminated list of null terminated strings and an empty list is\0\0and not\0.EDIT: Oh, CreateEnvironmentBlock states this much more explicitly.
Fixes #31259