MFH

diff --git a/main/php_ini.c b/main/php_ini.c
index b92a83b193e56d7ec0e33f6a0455b9af6768b9fc..b7ff09b51a7942d19acd591f4bd87105a0bee91e 100644 (file)
--- 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);