archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix GH-7896: Environment vars may be mangled on Windows

Browse source 
When bug 77574[1] has been fixed, the fix only catered to variables
retrieved via `getenv()` with a `$varname` passed, but neither to
`getenv()` without arguments nor to the general import of environment
variables into `$_ENV` and `$_SERVER`.  We catch up on this by using
`GetEnvironmentStringsW()` in `_php_import_environment_variables()` and
converting the encoding to whatever had been chosen by the user.

[1] <https://bugs.php.net/bug.php?id=75574>

Closes GH-7928.
This commit is contained in:
Christoph M. Becker 2022-01-11 13:43:42 +01:00
parent 478edcdacb
commit 93a3c71eb4
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
3 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
main/php_variables.c
View file

@ -571,11 +571,15 @@ void _php_import_environment_variables(zval *array_ptr)
import_environment_variable(Z_ARRVAL_P(array_ptr), *env);
}
#else
char *environment = GetEnvironmentStringsA();
for (char *env = environment; env != NULL && *env; env += strlen(env) + 1) {
import_environment_variable(Z_ARRVAL_P(array_ptr), env);
wchar_t *environmentw = GetEnvironmentStringsW();
for (wchar_t *envw = environmentw; envw != NULL && *envw; envw += wcslen(envw) + 1) {
char *env = php_win32_cp_w_to_any(envw);
if (env != NULL) {
import_environment_variable(Z_ARRVAL_P(array_ptr), env);
free(env);
}
}
FreeEnvironmentStringsA(environment);
FreeEnvironmentStringsW(environmentw);
#endif
tsrm_env_unlock();