Don't insert empty path if PHPRC is empty

diff --git a/main/php_ini.c b/main/php_ini.c
index 6f03ebe35d2f7dc55e2e58b3cf39eb240b6e7926..fbc29bba4b492314f5fc548e3f021c6584b35c6c 100644 (file)
--- 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);
                }