From: Rasmus Lerdorf <rasmus@php.net>
Date: Mon, 26 Jun 2006 13:10:31 +0000 (+0000)
Subject: Cleaner fix
X-Git-Tag: RELEASE_1_0_0RC1~2639
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=157ce4f35ea684eedef371a8e57c632cf89872db;p=php

Cleaner fix
---

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 600a294790..2d74ef338a 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -4308,14 +4308,10 @@ PHP_FUNCTION(getenv)
 		RETURN_FALSE;
 	}
 	ptr = sapi_getenv(str, str_len TSRMLS_CC);
-	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, 0);
+	ptr = getenv(str);
+	if(ptr) RETURN_RT_STRING(ptr, 1);
+	RETURN_FALSE;
 }
 /* }}} */