From: Pierre Joye <pajoye@php.net>
Date: Mon, 26 Sep 2011 08:49:28 +0000 (+0000)
Subject: - be sure to check if the var ha not been removed between the two calls
X-Git-Tag: php-5.4.0beta2~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d435ddbe526e8fdcb9786c0a1b7906eff876f6e4;p=php

- be sure to check if the var ha not been removed between the two calls
---

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;
+					}
 				}
 			}
 		}