From eef9835bb1b3d6485ebf3222538baca69f4eb72b Mon Sep 17 00:00:00 2001 From: Rasmus Lerdorf Date: Mon, 26 Jun 2006 13:03:41 +0000 Subject: [PATCH] sapi_getenv() estrdups the returned string now, so we need to free it --- ext/standard/basic_functions.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 5168cbd9f91..600a294790f 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -4308,13 +4308,14 @@ PHP_FUNCTION(getenv) RETURN_FALSE; } ptr = sapi_getenv(str, str_len TSRMLS_CC); - if (! ptr) { + if(ptr) { + RETVAL_RT_STRING(ptr,1); + efree(ptr); + } else { ptr = getenv(str); + if(ptr) RETURN_RT_STRING(ptr, 1); + else RETURN_FALSE; } - if (ptr) { - RETURN_RT_STRING(ptr, 1); - } - RETURN_FALSE; } /* }}} */