From: Antony Dovgal <tony2001@php.net>
Date: Mon, 14 May 2007 12:19:34 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-5.2.3RC1~95
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d85fc29edf8d06f1f71bebf3db5985f5e674b4c5;p=php

MFH
---

diff --git a/main/php_ini.c b/main/php_ini.c
index b92a83b193..b7ff09b51a 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -360,11 +360,10 @@ int php_init_config(TSRMLS_D)
 				if ((envpath = getenv("PATH")) != NULL) {
 					char *search_dir, search_path[MAXPATHLEN];
 					char *last;
-					int pathlen = strlen(envpath) + 1;
-					path = malloc(pathlen);
-					memcpy(path, envpath, pathlen);
 
+					path = estrdup(envpath);
 					search_dir = php_strtok_r(path, ":", &last);
+
 					while (search_dir) {
 						snprintf(search_path, MAXPATHLEN, "%s/%s", search_dir, sapi_module.executable_location);
 						if (VCWD_REALPATH(search_path, binary_location) && !VCWD_ACCESS(binary_location, X_OK)) {
@@ -373,6 +372,7 @@ int php_init_config(TSRMLS_D)
 						}
 						search_dir = php_strtok_r(NULL, ":", &last);
 					}
+					efree(path);
 				}
 				if (!found) {
 					efree(binary_location);