diff options
author | Pierre Joye <pajoye@php.net> | 2011-09-26 08:49:28 +0000 |
---|---|---|
committer | Pierre Joye <pajoye@php.net> | 2011-09-26 08:49:28 +0000 |
commit | d435ddbe526e8fdcb9786c0a1b7906eff876f6e4 (patch) | |
tree | a622c77ec7e0f82309517c5511d0343b6c3acab5 | |
parent | 60bf324ed5fafbba9c307b167bdfda96614f1637 (diff) | |
download | php-git-d435ddbe526e8fdcb9786c0a1b7906eff876f6e4.tar.gz |
- be sure to check if the var ha not been removed between the two calls
-rw-r--r-- | main/php_ini.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index 7d7c26012e..1ffc08b187 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -421,7 +421,11 @@ int php_init_config(TSRMLS_D) env_location = ""; } else { size = GetEnvironmentVariableA("PHPRC", phprc_path, size); - env_location = phprc_path; + if (size == 0) { + env_location = ""; + } else { + env_location = phprc_path; + } } } } |