diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-24 11:44:47 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-24 11:44:47 +0200 |
| commit | 2a28589c7def80ecc7bb3417a8853df6b7860b46 (patch) | |
| tree | 6f735e9f8f3157ba33b80bbb352402ec0a3340c4 | |
| parent | cbce0cbacbbe264878a2eedf945460929b9a2b72 (diff) | |
| parent | 32257ac17f68b4f8a5c276b92521f338f6c7cf86 (diff) | |
| download | php-git-2a28589c7def80ecc7bb3417a8853df6b7860b46.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix potential environment variable deadlock
| -rwxr-xr-x | ext/standard/basic_functions.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 3c2c18db96..a02a26b1a6 100755 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -908,6 +908,7 @@ PHP_FUNCTION(putenv) } /* valw may be NULL, but the failed conversion still needs to be checked. */ if (!keyw || !valw && value) { + tsrm_env_unlock(); efree(pe.putenv_string); efree(pe.key); free(keyw); |