Skip to content

Commit 2fc27b7

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Fix GH-14590: Memory leak in FPM test gh13563-conf-bool-env.phpt
2 parents 532a260 + 4137190 commit 2fc27b7

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Zend/zend_ini_parser.y

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,10 @@ static void zend_ini_get_var(zval *result, zval *name, zval *fallback)
179179
if ((curval = zend_get_configuration_directive(Z_STR_P(name))) != NULL) {
180180
ZVAL_NEW_STR(result, zend_string_init(Z_STRVAL_P(curval), Z_STRLEN_P(curval), ZEND_SYSTEM_INI));
181181
/* ..or if not found, try ENV */
182-
} else if ((envvar = zend_getenv(Z_STRVAL_P(name), Z_STRLEN_P(name))) != NULL ||
183-
(envvar = getenv(Z_STRVAL_P(name))) != NULL) {
182+
} else if ((envvar = zend_getenv(Z_STRVAL_P(name), Z_STRLEN_P(name))) != NULL) {
183+
ZVAL_NEW_STR(result, zend_string_init(envvar, strlen(envvar), ZEND_SYSTEM_INI));
184+
efree(envvar);
185+
} else if ((envvar = getenv(Z_STRVAL_P(name))) != NULL) {
184186
ZVAL_NEW_STR(result, zend_string_init(envvar, strlen(envvar), ZEND_SYSTEM_INI));
185187
/* ..or if not defined, try fallback value */
186188
} else if (fallback) {

0 commit comments

Comments
 (0)