Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  Fix GH-17403: Potential deadlock when putenv fails
This commit is contained in:
Niels Dossche 2025-04-24 20:22:30 +02:00
commit c6ed104e91
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
2 changed files with 4 additions and 0 deletions

View file

@ -827,6 +827,7 @@ PHP_FUNCTION(putenv)
#endif
RETURN_TRUE;
} else {
tsrm_env_unlock();
free(pe.putenv_string);
zend_string_release(pe.key);
#ifdef PHP_WIN32