Merge branch 'PHP-8.3' into PHP-8.4

ndossche · ndossche · commit c6ed104e916c · 2025-04-24T20:22:30.000+02:00
* PHP-8.3: Fix phpGH-17403: Potential deadlock when putenv fails
diff --git a/NEWS b/NEWS
@@ -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:
diff --git 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
