rasmus Mon Jun 26 13:15:21 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard basic_functions.c
Log:
MFH: fix sapi_getenv() leak
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.6&r2=1.725.2.31.2.7&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.6
php-src/ext/standard/basic_functions.c:1.725.2.31.2.7
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.6 Sun Jun 25
21:06:39 2006
+++ php-src/ext/standard/basic_functions.c Mon Jun 26 13:15:20 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.6 2006/06/25 21:06:39 bjori Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.7 2006/06/26 13:15:20 rasmus Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1427,12 +1427,9 @@
RETURN_FALSE;
}
ptr = sapi_getenv(str, str_len TSRMLS_CC);
- if (! ptr) {
- ptr = getenv(str);
- }
- if (ptr) {
- RETURN_STRING(ptr, 1);
- }
+ if(ptr) RETURN_STRING(ptr, 0);
+ ptr = getenv(str);
+ if(ptr) RETURN_STRING(ptr, 1);
RETURN_FALSE;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
