]> granicus.if.org Git - php/commitdiff
- be sure to check if the var ha not been removed between the two calls
authorPierre Joye <pajoye@php.net>
Mon, 26 Sep 2011 08:49:28 +0000 (08:49 +0000)
committerPierre Joye <pajoye@php.net>
Mon, 26 Sep 2011 08:49:28 +0000 (08:49 +0000)
main/php_ini.c

index 7d7c26012eec40b77e511274b28dea2cb238474c..1ffc08b1871a850c4504e4dcfe8cd2e060694b6b 100644 (file)
@@ -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;
+                                       }
                                }
                        }
                }