strdup env_location

Author: glensc

main/php_ini.c

@@ -432,27 +432,27 @@ static char* get_env_location(const char *envname)
 		size = GetEnvironmentVariableA(envname, &dummybuf, 0);
 		if (GetLastError() == ERROR_ENVVAR_NOT_FOUND) {
 			/* The environment variable doesn't exist. */
-			return "";
+			return NULL;
 		}
 
 		if (size == 0) {
-			return "";
+			return NULL;
 		}
 
 		size = GetEnvironmentVariableA(envname, phprc_path, size);
 		if (size == 0) {
-			return "";
+			return NULL;
 		}
 
 		env_location = phprc_path;
 	}
 #else
 	if (!env_location) {
-		return "";
+		return NULL;
 	}
 #endif
 
-	return env_location;
+	return estrdup(env_location);
 }
 /* }}} */
 
@@ -520,6 +520,10 @@ int php_init_config(void)
 			php_ini_file_name = env_location;
 		}
 
+		if (env_location) {
+			efree(env_location);
+		}
+
 #ifdef PHP_WIN32
 		/* Add registry location */
 		reg_location = GetIniPathFromRegistry();