From: Stanislav Malyshev <stas@php.net>
Date: Tue, 6 Mar 2001 11:38:55 +0000 (+0000)
Subject: Don't insert empty path if PHPRC is empty
X-Git-Tag: php-4.0.5RC1~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c2ea02288b0c5b607c85e21b4f51c8082d61255;p=php

Don't insert empty path if PHPRC is empty
---

diff --git a/main/php_ini.c b/main/php_ini.c
index 6f03ebe35d..fbc29bba4b 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -241,7 +241,11 @@ int php_init_config(char *php_ini_path_override)
 #endif
 		php_ini_search_path = (char *) emalloc(sizeof(".")+strlen(env_location)+strlen(default_location)+2+1);
 		free_ini_search_path = 1;
-		sprintf(php_ini_search_path, ".%c%s%c%s", ZEND_PATHS_SEPARATOR, env_location, ZEND_PATHS_SEPARATOR, default_location);
+		if(env_location && env_location[0]) {
+			sprintf(php_ini_search_path, ".%c%s%c%s", ZEND_PATHS_SEPARATOR, env_location, ZEND_PATHS_SEPARATOR, default_location);
+		} else {
+			sprintf(php_ini_search_path, ".%c%s", ZEND_PATHS_SEPARATOR, default_location);
+		}
 		if (free_default_location) {
 			efree(default_location);
 		}