Skip to content

Commit 2a28589

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Fix potential environment variable deadlock
2 parents cbce0cb + 32257ac commit 2a28589

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

ext/standard/basic_functions.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -908,6 +908,7 @@ PHP_FUNCTION(putenv)
908908
}
909909
/* valw may be NULL, but the failed conversion still needs to be checked. */
910910
if (!keyw || !valw && value) {
911+
tsrm_env_unlock();
911912
efree(pe.putenv_string);
912913
efree(pe.key);
913914
free(keyw);

0 commit comments

Comments
 (0)