Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3: Fix GH-17403: Potential deadlock when putenv fails
2026-03-24 00:02:20 +01:00 · 2025-04-24 20:22:30 +02:00
parent 303610154b 32e091260a
commit c6ed104e91
2 changed files with 4 additions and 0 deletions
--- a/3
+++ b/3
@@ -7,6 +7,9 @@ PHP                                                                        NEWS
    inaccurate sunrise and sunset times, but other calculated times are
    correct) (JiriJozif).

+- Standard:
+  . Fixed bug GH-17403 (Potential deadlock when putenv fails). (nielsdos)
+
 24 Apr 2025, PHP 8.4.7

 - Core:
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -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