Fix getenv()/putenv() glitches on Windows #5730
Draft
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
We fix some wrong assumptions regarding `GetEnvironmentVariableW()`s return value; although the comment got it right, the implementation did not. We also attempt to improve our `putenv()` implementation. The problem that the underlying `_putenv()` is not thread-safe is no longer an issue, since there are mutexes in place. This fixes the ZTS part of bug #66265. However, calling `_putenv()` after `SetEnvironmentVariable()` causes issues regarding empty strings as variable values, because `_putenv()` does not support that (instead, it removes the variable from the environment). Therefore we swap both calls.
cmb69
changed the title
nikic
reviewed
Jun 23, 2020
| efree(pe.putenv_string); | ||
| efree(pe.key); | ||
| free(keyw); | ||
| free(valw); |
There was a problem hiding this comment.
This whole code is a big mess and we fail to unlock in this branch.
There was a problem hiding this comment.
Thanks! I fixed the latter with 32257ac (PHP-7.4), and will have a look at cleaning up the code as soon as possible.
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.
We fix some wrong assumptions regarding
GetEnvironmentVariableW()sreturn value; although the comment got it right, the implementation
did not.
We also attempt to improve our
putenv()implementation. The problemthat the underlying
_putenv()is not thread-safe is no longer anissue, since there are mutexes in place. This fixes the ZTS part of
bug #66265.
However, calling
_putenv()afterSetEnvironmentVariable()causesissues regarding empty strings as variable values, because
_putenv()does not support that (instead, it removes the variable from the
environment). Therefore we swap both calls.